add Attributes minus

# Conflicts:
#	gradle.properties

attributes-kt/src/commonMain/kotlin/space/kscience/attributes/Attributes.kt

@@ -140,4 +140,18 @@ public fun <A : Attribute<Unit>> Attributes(
     attribute: A,
 ): Attributes = MapAttributes(mapOf(attribute to Unit))
 
-public operator fun Attributes.plus(other: Attributes): Attributes = MapAttributes(content + other.content)
+/**
+ * Create a new [Attributes] that overlays [other] on top of this set of attributes. New attributes are added.
+ * Existing attribute keys are replaced.
+ */
+public operator fun Attributes.plus(other: Attributes): Attributes = when {
+    isEmpty() -> other
+    other.isEmpty() -> this
+    else -> MapAttributes(content + other.content)
+}
+
+/**
+ * Create a new [Attributes] with removed [key] (if it is present).
+ */
+public operator fun Attributes.minus(key: Attribute<*>): Attributes =
+    if (content.contains(key)) MapAttributes(content.minus(key)) else this

benchmarks/build.gradle.kts

@@ -1,6 +1,5 @@
 @file:Suppress("UNUSED_VARIABLE")
 
-import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 import space.kscience.kmath.benchmarks.addBenchmarkProperties
 
 plugins {
@@ -152,18 +151,12 @@ benchmark {
     }
 }
 
-kotlin.sourceSets.all {
+kotlin {
-    with(languageSettings) {
+    jvmToolchain(11)
-        optIn("kotlin.contracts.ExperimentalContracts")
+    compilerOptions {
-        optIn("kotlin.ExperimentalUnsignedTypes")
+        optIn.addAll(
-        optIn("space.kscience.kmath.UnstableKMathAPI")
+            "space.kscience.kmath.UnstableKMathAPI"
-    }
+        )
-}
-
-tasks.withType<KotlinJvmCompile> {
-    kotlinOptions {
-        jvmTarget = "11"
-        freeCompilerArgs = freeCompilerArgs + "-Xjvm-default=all" + "-Xlambdas=indy"
     }
 }
 

build.gradle.kts

@@ -16,7 +16,7 @@ allprojects {
     }
 
     group = "space.kscience"
-    version = "0.4.0"
+    version = "0.4.1-dev"
 }
 
 subprojects {

buildSrc/build.gradle.kts

@@ -1,4 +1,5 @@
 plugins {
+    kotlin("jvm") version "1.9.23"
     `kotlin-dsl`
     `version-catalog`
 }
@@ -25,10 +26,8 @@ dependencies {
 }
 
 kotlin {
-    jvmToolchain {
+    jvmToolchain(11)
-        languageVersion.set(JavaLanguageVersion.of(11))
+    compilerOptions {
-    }
+        optIn.add("kotlin.OptIn")
-    sourceSets.all {
-        languageSettings.optIn("kotlin.OptIn")
     }
 }

gradle.properties

@@ -9,6 +9,7 @@ org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx4096m
 org.gradle.parallel=true
 org.gradle.workers.max=4
-toolsVersion=0.15.2-kotlin-1.9.22
+
+toolsVersion=0.15.4-kotlin-2.0.0
 #kotlin.experimental.tryK2=true
 #kscience.wasm.disabled=true

kmath-ast/build.gradle.kts

@@ -4,7 +4,20 @@ plugins {
 
 kscience {
     jvm()
-    js()
+    js{
+        nodejs {
+            testTask {
+                useMocha().timeout = "0"
+            }
+        }
+
+        browser {
+            useCommonJs()
+            testTask {
+                useMocha().timeout = "0"
+            }
+        }
+    }
     native()
 
     dependencies {
@@ -18,7 +31,7 @@ kscience {
 
     dependencies(jsMain) {
         implementation(npm("astring", "1.7.5"))
-        implementation(npm("binaryen", "101.0.0"))
+        implementation(npm("binaryen", "117.0.0"))
         implementation(npm("js-base64", "3.6.1"))
     }
 
@@ -29,19 +42,6 @@ kscience {
 }
 
 kotlin {
-    js {
-        nodejs {
-            testTask {
-                useMocha().timeout = "0"
-            }
-        }
-
-        browser {
-            testTask {
-                useMocha().timeout = "0"
-            }
-        }
-    }
 
     sourceSets {
         filter { it.name.contains("test", true) }

kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/base64/base64.kt

@@ -4,11 +4,6 @@
  */
 
 @file:Suppress(
-    "INTERFACE_WITH_SUPERCLASS",
-    "OVERRIDING_FINAL_MEMBER",
-    "RETURN_TYPE_MISMATCH_ON_OVERRIDE",
-    "CONFLICTING_OVERLOADS",
-    "NO_EXPLICIT_VISIBILITY_IN_API_MODE_WARNING",
     "ObjectPropertyName",
     "ClassName",
 )

kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/binaryen/index.binaryen.kt

@@ -4,10 +4,6 @@
  */
 
 @file:Suppress(
-    "INTERFACE_WITH_SUPERCLASS",
-    "OVERRIDING_FINAL_MEMBER",
-    "RETURN_TYPE_MISMATCH_ON_OVERRIDE",
-    "CONFLICTING_OVERLOADS",
     "PropertyName",
     "ClassName", "ENUM_CLASS_IN_EXTERNAL_DECLARATION_WARNING",
 )

kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/lib.dom.WebAssembly.module_dukat.kt

@@ -6,10 +6,6 @@
 @file:JsQualifier("WebAssembly")
 
 @file:Suppress(
-    "INTERFACE_WITH_SUPERCLASS",
-    "OVERRIDING_FINAL_MEMBER",
-    "RETURN_TYPE_MISMATCH_ON_OVERRIDE",
-    "NO_EXPLICIT_VISIBILITY_IN_API_MODE_WARNING",
     "ClassName",
 )
 
@@ -22,78 +18,34 @@ import org.w3c.fetch.Response
 import space.kscience.kmath.internal.tsstdlib.PromiseLike
 import kotlin.js.Promise
 
-@Suppress("NESTED_CLASS_IN_EXTERNAL_INTERFACE")
+internal external interface CompileError 
-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
-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
-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 {

kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/webassembly/nonDeclarations.WebAssembly.kt

@@ -3,13 +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.
  */
 
-@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
 

kmath-ast/src/jvmTest/kotlin/space/kscience/kmath/ast/utils.kt

@@ -12,8 +12,6 @@ import space.kscience.kmath.expressions.Symbol
 import space.kscience.kmath.operations.Algebra
 import space.kscience.kmath.operations.Float64Field
 import space.kscience.kmath.operations.Int32Ring
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
 import space.kscience.kmath.asm.compile as asmCompile
 import space.kscience.kmath.asm.compileToExpression as asmCompileToExpression
 
@@ -43,7 +41,6 @@ private object PrimitiveAsmCompilerTestContext : CompilerTestContext {
 
 
 internal actual inline fun runCompilerTest(action: CompilerTestContext.() -> Unit) {
-    contract { callsInPlace(action, InvocationKind.EXACTLY_ONCE) }
     action(GenericAsmCompilerTestContext)
     action(PrimitiveAsmCompilerTestContext)
 }

kmath-core/src/commonMain/kotlin/space/kscience/kmath/nd/ShapeND.kt

@@ -6,7 +6,6 @@
 package space.kscience.kmath.nd
 
 import space.kscience.kmath.UnsafeKMathAPI
-import kotlin.jvm.JvmInline
 
 /**
  * A read-only ND shape

kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt

@@ -159,7 +159,7 @@ class Rational {
     override fun equals(other: Any?): Boolean =
         when (other) {
             is Rational -> numerator == other.numerator && denominator == other.denominator
-            is Int -> numerator == other && denominator == 1L
+            is Int -> numerator == other.toLong() && denominator == 1L
             is Long -> numerator == other && denominator == 1L
             else -> false
         }

kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram.kt

@@ -33,7 +33,7 @@ public interface Histogram<in T : Any, out V, out B : Bin<T, V>> {
     /**
      * Find existing bin, corresponding to given coordinates
      */
-    public operator fun get(point: Point<out T>): B?
+    public operator fun get(point: Point<T>): B?
 
     /**
      * Dimension of the histogram
@@ -57,7 +57,7 @@ public interface HistogramBuilder<in T, V> {
     /**
      * Increment appropriate bin with given value
      */
-    public fun putValue(point: Point<out T>, value: V = defaultValue)
+    public fun putValue(point: Point<T>, value: V = defaultValue)
 
 }
 

kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/Histogram1D.kt

@@ -42,7 +42,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) {
+    override fun putValue(point: Point<T>, value: V) {
         require(point.size == 1) { "Only points with single value could be used in Histogram1D" }
         putValue(point[0], value)
     }

kmath-histograms/src/commonMain/kotlin/space/kscience/kmath/histogram/UniformHistogramGroupND.kt

@@ -93,7 +93,7 @@ public class UniformHistogramGroupND<V : Any, A : Field<V>>(
         val hBuilder = object : HistogramBuilder<Double, V> {
             override val defaultValue: V get() = valueAlgebraND.elementAlgebra.one
 
-            override fun putValue(point: Point<out Double>, value: V) = with(valueAlgebraND.elementAlgebra) {
+            override fun putValue(point: Point<Double>, value: V) = with(valueAlgebraND.elementAlgebra) {
                 val index = getIndexOrNull(point)
                 ndCounter[index].add(value)
             }