Merge remote-tracking branch 'origin/dev' into kotlin14

# Conflicts: # build.gradle.kts # examples/src/main/kotlin/scientifik/kmath/linear/LinearAlgebraBenchmark.kt # kmath-ast/build.gradle.kts # kmath-commons/build.gradle.kts # kmath-core/src/commonMain/kotlin/scientifik/kmath/operations/Complex.kt # kmath-core/src/commonMain/kotlin/scientifik/kmath/structures/Buffers.kt # kmath-core/src/commonMain/kotlin/scientifik/kmath/structures/FlaggedBuffer.kt # kmath-core/src/commonMain/kotlin/scientifik/kmath/structures/IntBuffer.kt # kmath-core/src/commonMain/kotlin/scientifik/kmath/structures/RealBuffer.kt # kmath-core/src/commonMain/kotlin/scientifik/kmath/structures/ShortBuffer.kt # kmath-for-real/build.gradle.kts # kmath-functions/build.gradle.kts # kmath-memory/build.gradle.kts # kmath-prob/build.gradle.kts
2020-09-20 16:44:46 +07:00 · 2020-09-20 16:44:46 +07:00 · ac6b7fad64
commit ac6b7fad64
parent ea70c255e9 40eadbdd04
18 changed files with 25 additions and 22 deletions
--- a/build.gradle.kts
+++ b/build.gradle.kts
@ -1,6 +1,8 @@
 import ru.mipt.npm.gradle.KSciencePublishPlugin

-plugins { id("ru.mipt.npm.publish") apply false }
+plugins {
+    id("ru.mipt.npm.publish") apply false
+}

 val kmathVersion: String by extra("0.1.4")
 val bintrayRepo: String by extra("scientifik")
@ -17,4 +19,6 @@ allprojects {
    version = kmathVersion
 }

-subprojects { if (name.startsWith("kmath")) apply<KSciencePublishPlugin>() }
+subprojects {
+    if (name.startsWith("kmath")) apply<KSciencePublishPlugin>()
+}
--- a/examples/src/main/kotlin/scientifik/kmath/structures/NDField.kt
+++ b/examples/src/main/kotlin/scientifik/kmath/structures/NDField.kt
@ -3,7 +3,6 @@ package scientifik.kmath.structures
 import kotlinx.coroutines.GlobalScope
 import scientifik.kmath.operations.RealField
 import scientifik.kmath.operations.invoke
-import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
 import kotlin.system.measureTimeMillis
--- a/kmath-ast/build.gradle.kts
+++ b/kmath-ast/build.gradle.kts
@ -1,4 +1,6 @@
-plugins { id("ru.mipt.npm.mpp") }
+plugins {
+    id("ru.mipt.npm.mpp")
+}

 kotlin.sourceSets {
    commonMain {
--- a/kmath-ast/src/jvmMain/kotlin/scientifik/kmath/asm/internal/codegenUtils.kt
+++ b/kmath-ast/src/jvmMain/kotlin/scientifik/kmath/asm/internal/codegenUtils.kt
@ -7,7 +7,6 @@ import scientifik.kmath.ast.MST
 import scientifik.kmath.expressions.Expression
 import scientifik.kmath.operations.Algebra
 import java.lang.reflect.Method
-import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
 import kotlin.reflect.KClass
--- a/kmath-commons/build.gradle.kts
+++ b/kmath-commons/build.gradle.kts
@ -1,4 +1,7 @@
-plugins { id("ru.mipt.npm.jvm") }
+plugins {
+    id("ru.mipt.npm.jvm")
+}
+
 description = "Commons math binding for kmath"

 dependencies {
--- a/kmath-core/src/commonMain/kotlin/scientifik/kmath/expressions/expressionBuilders.kt
+++ b/kmath-core/src/commonMain/kotlin/scientifik/kmath/expressions/expressionBuilders.kt
@ -4,7 +4,6 @@ import scientifik.kmath.operations.ExtendedField
 import scientifik.kmath.operations.Field
 import scientifik.kmath.operations.Ring
 import scientifik.kmath.operations.Space
-import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract

--- a/kmath-core/src/commonMain/kotlin/scientifik/kmath/linear/FeaturedMatrix.kt
+++ b/kmath-core/src/commonMain/kotlin/scientifik/kmath/linear/FeaturedMatrix.kt
@ -4,7 +4,6 @@ import scientifik.kmath.operations.Ring
 import scientifik.kmath.structures.Matrix
 import scientifik.kmath.structures.Structure2D
 import scientifik.kmath.structures.asBuffer
-import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.contract
 import kotlin.math.sqrt

--- a/kmath-core/src/commonMain/kotlin/scientifik/kmath/misc/AutoDiff.kt
+++ b/kmath-core/src/commonMain/kotlin/scientifik/kmath/misc/AutoDiff.kt
@ -6,7 +6,6 @@ import scientifik.kmath.operations.Field
 import scientifik.kmath.operations.invoke
 import scientifik.kmath.operations.sum
 import scientifik.kmath.structures.asBuffer
-import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract

--- a/kmath-core/src/commonMain/kotlin/scientifik/kmath/structures/FloatBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/scientifik/kmath/structures/FloatBuffer.kt
@ -1,6 +1,5 @@
 package scientifik.kmath.structures

-import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.contract

 /**
--- a/kmath-core/src/commonMain/kotlin/scientifik/kmath/structures/LongBuffer.kt
+++ b/kmath-core/src/commonMain/kotlin/scientifik/kmath/structures/LongBuffer.kt
@ -1,6 +1,5 @@
 package scientifik.kmath.structures

-import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.contract

 /**
--- a/kmath-core/src/commonTest/kotlin/scientifik/kmath/linear/RealLUSolverTest.kt
+++ b/kmath-core/src/commonTest/kotlin/scientifik/kmath/linear/RealLUSolverTest.kt
@ -1,11 +1,9 @@
 package scientifik.kmath.linear

 import scientifik.kmath.structures.Matrix
-import kotlin.contracts.ExperimentalContracts
 import kotlin.test.Test
 import kotlin.test.assertEquals

-@ExperimentalContracts
 class RealLUSolverTest {

    @Test
--- a/kmath-for-real/build.gradle.kts
+++ b/kmath-for-real/build.gradle.kts
@ -1,4 +1,6 @@
-plugins { id("ru.mipt.npm.mpp") }
+plugins {
+    id("ru.mipt.npm.mpp")
+}

 kotlin.sourceSets.commonMain {
    dependencies {
--- a/kmath-for-real/src/commonMain/kotlin/scientifik/kmath/real/realMatrix.kt
+++ b/kmath-for-real/src/commonMain/kotlin/scientifik/kmath/real/realMatrix.kt
@ -9,7 +9,6 @@ import scientifik.kmath.structures.Buffer
 import scientifik.kmath.structures.Matrix
 import scientifik.kmath.structures.RealBuffer
 import scientifik.kmath.structures.asIterable
-import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.contract
 import kotlin.math.pow

--- a/kmath-functions/build.gradle.kts
+++ b/kmath-functions/build.gradle.kts
@ -1,4 +1,6 @@
-plugins { id("ru.mipt.npm.mpp") }
+plugins {
+    id("ru.mipt.npm.mpp")
+}

 kotlin.sourceSets.commonMain {
    dependencies {
--- a/kmath-histograms/src/commonMain/kotlin/scientifik/kmath/histogram/Histogram.kt
+++ b/kmath-histograms/src/commonMain/kotlin/scientifik/kmath/histogram/Histogram.kt
@ -4,9 +4,6 @@ import scientifik.kmath.domains.Domain
 import scientifik.kmath.linear.Point
 import scientifik.kmath.structures.ArrayBuffer
 import scientifik.kmath.structures.RealBuffer
-import kotlin.contracts.ExperimentalContracts
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract

 /**
 * The bin in the histogram. The histogram is by definition always done in the real space
--- a/kmath-memory/build.gradle.kts
+++ b/kmath-memory/build.gradle.kts
@ -1 +1,3 @@
-plugins { id("ru.mipt.npm.mpp") }
+plugins {
+    id("ru.mipt.npm.mpp")
+}
--- a/kmath-memory/src/jvmMain/kotlin/scientifik/memory/ByteBufferMemory.kt
+++ b/kmath-memory/src/jvmMain/kotlin/scientifik/memory/ByteBufferMemory.kt
@ -6,7 +6,6 @@ import java.nio.channels.FileChannel
 import java.nio.file.Files
 import java.nio.file.Path
 import java.nio.file.StandardOpenOption
-import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract

--- a/kmath-prob/build.gradle.kts
+++ b/kmath-prob/build.gradle.kts
@ -1,4 +1,6 @@
-plugins { id("ru.mipt.npm.mpp") }
+plugins {
+    id("ru.mipt.npm.mpp")
+}

 kotlin.sourceSets {
    commonMain {