diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts index ea9934a52..aa3d31247 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 919356c0f..36bc3a73f 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 990b564e1..36715cd78 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 da7380e41..2f6d41bbb 100644 --- a/kmath-kotlingrad/build.gradle.kts +++ b/kmath-kotlingrad/build.gradle.kts @@ -11,8 +11,8 @@ kotlin.sourceSets 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 f4386f434..f7858e172 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 0d4e457af..31b8a9286 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 4d01677af..37ce40cab 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 7f065490c..570d7dd7f 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>().name) val c2 = "kitten".parseMath().toSFun>() - 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().doubleValue == 12354324.0) val c2 = "0.234".parseMath().toSFun>() - 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>() - 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>() - 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