Fully refactor algebra split ScaleOperations from Space.

.github/workflows/build.yml

@@ -1,6 +1,5 @@
-# Based on https://github.com/touchlab/Stately/blob/main/.github/workflows/build.yml
+name: Gradle build
 
-name: build
 on: [ push ]
 
 jobs:

.github/workflows/deploy.yml → .github/workflows/publish.yml

@@ -1,10 +1,15 @@
-# Based on https://github.com/touchlab/Stately/blob/main/.github/workflows/deploy.yml
+name: Gradle publish
 
-name: deploy
-on: workflow_dispatch
+on:
+ workflow_dispatch:
+ release:
+ types:
+ - created
 
 jobs:
- build:
+ publish:
+ environment:
+ name: publish
  strategy:
  matrix:
  os: [macOS-latest, windows-latest]
@@ -33,13 +38,22 @@ jobs:
  key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
  restore-keys: |
  ${{ runner.os }}-gradle-
- - name: Publish Mac Artifacts
- if: matrix.os == 'macOS-latest'
- run: ./gradlew publishAllPublicationsToSpaceRepository publishAllPublicationsToSonatypeRepository --no-daemon --stacktrace -PsonatypePublish=true -PsonatypeUser=${{ secrets.SONATYPE_USERNAME }} -PsonatypePassword=${{ secrets.SONATYPE_PASSWORD }} -PspaceUser=${{ secrets.SPACE_USERNAME }} -PspacePassword=${{ secrets.SPACE_PASSWORD }}
- env:
- signingKey: ${{ secrets.SIGNING_KEY }}
  - name: Publish Windows Artifacts
  if: matrix.os == 'windows-latest'
- run: ./gradlew publishAllPublicationsToSpaceRepository publishAllPublicationsToSonatypeRepository --no-daemon --stacktrace -PsonatypePublish=true -PsonatypeUser=${{ secrets.SONATYPE_USERNAME }} -PsonatypePassword=${{ secrets.SONATYPE_PASSWORD }} -PspaceUser=${{ secrets.SPACE_USERNAME }} -PspacePassword=${{ secrets.SPACE_PASSWORD }}
- env:
- signingKey: ${{ secrets.SIGNING_KEY }}
+ run: >
+ ./gradlew release --no-daemon
+ -Ppublishing.enabled=true
+ -Ppublishing.github.user=${{ secrets.PUBLISHING_GITHUB_USER }}
+ -Ppublishing.github.token=${{ secrets.PUBLISHING_GITHUB_TOKEN }}
+ -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 }}
+ -Ppublishing.space.user=${{ secrets.PUBLISHING_SPACE_USER }}
+ -Ppublishing.space.token=${{ secrets.PUBLISHING_SPACE_TOKEN }}

CHANGELOG.md

@@ -2,12 +2,17 @@
 
 ## [Unreleased]
 ### Added
+- Intrinsic value `two` for ExtendedField to work with hyperbolic functions
+- ScaleOperations interface
 
 ### Changed
+- Exponential operations merged with hyperbolic functions
 
 ### Deprecated
 
 ### Removed
+- Nearest in Domain. To be implemented in geometry package.
+- Number multiplication and division in main Algebra chain
 
 ### Fixed
 

build.gradle.kts

@@ -20,7 +20,7 @@ allprojects {
  }
 
  group = "space.kscience"
- version = "0.2.0"
+ version = "0.3.0"
 }
 
 subprojects {
@@ -32,9 +32,8 @@ readme {
 }
 
 ksciencePublish {
- spaceRepo = "https://maven.pkg.jetbrains.space/mipt-npm/p/sci/maven"
- bintrayRepo = "kscience"
- githubProject = "kmath"
+ github("kmath")
+ space()
 }
 
 apiValidation {

examples/src/main/kotlin/space/kscience/kmath/ast/expressions.kt

@@ -6,10 +6,10 @@ import space.kscience.kmath.operations.RealField
 fun main() {
  val expr = RealField.mstInField {
  val x = bindSymbol("x")
- x * 2.0 + 2.0 / x - 16.0
+ x * 2.0 + 2.0 * one / x - 16.0
  }
 
- repeat(10000000){
+ repeat(10000000) {
  expr.invoke("x" to 1.0)
  }
 }

examples/src/main/kotlin/space/kscience/kmath/structures/ParallelRealNDField.kt

@@ -3,8 +3,8 @@ package space.kscience.kmath.structures
 import space.kscience.kmath.misc.UnstableKMathAPI
 import space.kscience.kmath.nd.*
 import space.kscience.kmath.operations.ExtendedField
+import space.kscience.kmath.operations.NumbersAddOperations
 import space.kscience.kmath.operations.RealField
-import space.kscience.kmath.operations.RingWithNumbers
 import java.util.*
 import java.util.stream.IntStream
 
@@ -15,7 +15,7 @@ import java.util.stream.IntStream
 class StreamRealNDField(
  override val shape: IntArray,
 ) : NDField<Double, RealField>,
- RingWithNumbers<NDStructure<Double>>,
+ NumbersAddOperations<NDStructure<Double>>,
  ExtendedField<NDStructure<Double>> {
 
  private val strides = DefaultStrides(shape)
@@ -79,25 +79,29 @@ class StreamRealNDField(
  return NDBuffer(strides, array.asBuffer())
  }
 
- override fun power(arg: NDStructure<Double>, pow: Number): NDBuffer<Double> = arg.map() { power(it, pow) }
+ override fun NDStructure<Double>.unaryMinus(): NDStructure<Double> = map { -it }
 
- override fun exp(arg: NDStructure<Double>): NDBuffer<Double> = arg.map() { exp(it) }
+ override fun scale(a: NDStructure<Double>, value: Double): NDStructure<Double> = a.map { it * value }
 
- override fun ln(arg: NDStructure<Double>): NDBuffer<Double> = arg.map() { ln(it) }
+ override fun power(arg: NDStructure<Double>, pow: Number): NDBuffer<Double> = arg.map { power(it, pow) }
 
- override fun sin(arg: NDStructure<Double>): NDBuffer<Double> = arg.map() { sin(it) }
- override fun cos(arg: NDStructure<Double>): NDBuffer<Double> = arg.map() { cos(it) }
- override fun tan(arg: NDStructure<Double>): NDBuffer<Double> = arg.map() { tan(it) }
- override fun asin(arg: NDStructure<Double>): NDBuffer<Double> = arg.map() { asin(it) }
- override fun acos(arg: NDStructure<Double>): NDBuffer<Double> = arg.map() { acos(it) }
- override fun atan(arg: NDStructure<Double>): NDBuffer<Double> = arg.map() { atan(it) }
+ override fun exp(arg: NDStructure<Double>): NDBuffer<Double> = arg.map { exp(it) }
 
- override fun sinh(arg: NDStructure<Double>): NDBuffer<Double> = arg.map() { sinh(it) }
- override fun cosh(arg: NDStructure<Double>): NDBuffer<Double> = arg.map() { cosh(it) }
- override fun tanh(arg: NDStructure<Double>): NDBuffer<Double> = arg.map() { tanh(it) }
- override fun asinh(arg: NDStructure<Double>): NDBuffer<Double> = arg.map() { asinh(it) }
- override fun acosh(arg: NDStructure<Double>): NDBuffer<Double> = arg.map() { acosh(it) }
- override fun atanh(arg: NDStructure<Double>): NDBuffer<Double> = arg.map() { atanh(it) }
+ override fun ln(arg: NDStructure<Double>): NDBuffer<Double> = arg.map { ln(it) }
+
+ override fun sin(arg: NDStructure<Double>): NDBuffer<Double> = arg.map { sin(it) }
+ override fun cos(arg: NDStructure<Double>): NDBuffer<Double> = arg.map { cos(it) }
+ override fun tan(arg: NDStructure<Double>): NDBuffer<Double> = arg.map { tan(it) }
+ override fun asin(arg: NDStructure<Double>): NDBuffer<Double> = arg.map { asin(it) }
+ override fun acos(arg: NDStructure<Double>): NDBuffer<Double> = arg.map { acos(it) }
+ override fun atan(arg: NDStructure<Double>): NDBuffer<Double> = arg.map { atan(it) }
+
+ override fun sinh(arg: NDStructure<Double>): NDBuffer<Double> = arg.map { sinh(it) }
+ override fun cosh(arg: NDStructure<Double>): NDBuffer<Double> = arg.map { cosh(it) }
+ override fun tanh(arg: NDStructure<Double>): NDBuffer<Double> = arg.map { tanh(it) }
+ override fun asinh(arg: NDStructure<Double>): NDBuffer<Double> = arg.map { asinh(it) }
+ override fun acosh(arg: NDStructure<Double>): NDBuffer<Double> = arg.map { acosh(it) }
+ override fun atanh(arg: NDStructure<Double>): NDBuffer<Double> = arg.map { atanh(it) }
 }
 
 fun NDAlgebra.Companion.realWithStream(vararg shape: Int): StreamRealNDField = StreamRealNDField(shape)

gradle.properties

@@ -1,9 +1,10 @@
 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=512m
 org.gradle.parallel=true
-systemProp.org.gradle.internal.publish.checksums.insecure=true
+
+kotlin.mpp.enableGranularSourceSetsMetadata=true
+kotlin.native.enableDependencyPropagation=false
+

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\:https://services.gradle.org/distributions/gradle-6.8.2-bin.zip
+distributionUrl=https\:https://services.gradle.org/distributions/gradle-6.8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

kmath-ast/src/commonMain/kotlin/space/kscience/kmath/ast/MstAlgebra.kt

@@ -20,8 +20,8 @@ public object MstAlgebra : NumericAlgebra<MST> {
 /**
  * [Space] over [MST] nodes.
  */
-public object MstSpace : Space<MST>, NumericAlgebra<MST> {
- public override val zero: MST.Numeric by lazy { number(0.0) }
+public object MstSpace : Space<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 bindSymbol(value: String): MST.Symbolic = MstAlgebra.bindSymbol(value)
@@ -35,8 +35,8 @@ public object MstSpace : Space<MST>, NumericAlgebra<MST> {
  public override operator fun MST.minus(b: MST): MST.Binary =
  binaryOperationFunction(SpaceOperations.MINUS_OPERATION)(this, b)
 
- public override fun multiply(a: MST, k: Number): MST.Binary =
- binaryOperationFunction(RingOperations.TIMES_OPERATION)(a, number(k))
+ public 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 =
  MstAlgebra.binaryOperationFunction(operation)
@@ -49,16 +49,17 @@ public object MstSpace : Space<MST>, NumericAlgebra<MST> {
  * [Ring] over [MST] nodes.
  */
 @OptIn(UnstableKMathAPI::class)
-public object MstRing : Ring<MST>, RingWithNumbers<MST> {
- public override val zero: MST.Numeric
- get() = MstSpace.zero
-
- public override val one: MST.Numeric by lazy { number(1.0) }
+public object MstRing : Ring<MST>, NumbersAddOperations<MST>, ScaleOperations<MST> {
+ public override val zero: MST.Numeric = MstSpace.zero
+ public override val one: MST.Numeric = number(1.0)
 
  public override fun number(value: Number): MST.Numeric = MstSpace.number(value)
  public override fun bindSymbol(value: String): MST.Symbolic = MstSpace.bindSymbol(value)
  public override fun add(a: MST, b: MST): MST.Binary = MstSpace.add(a, b)
- public override fun multiply(a: MST, k: Number): MST.Binary = MstSpace.multiply(a, k)
+
+ public override fun scale(a: MST, value: Double): MST.Binary =
+ MstSpace.binaryOperationFunction(RingOperations.TIMES_OPERATION)(a, MstSpace.number(value))
+
  public override fun multiply(a: MST, b: MST): MST.Binary =
  binaryOperationFunction(RingOperations.TIMES_OPERATION)(a, b)
 
@@ -77,17 +78,18 @@ public object MstRing : Ring<MST>, RingWithNumbers<MST> {
  * [Field] over [MST] nodes.
  */
 @OptIn(UnstableKMathAPI::class)
-public object MstField : Field<MST>, RingWithNumbers<MST> {
- public override val zero: MST.Numeric
- get() = MstRing.zero
+public object MstField : Field<MST>, NumbersAddOperations<MST>, ScaleOperations<MST> {
+ public override val zero: MST.Numeric get() = MstRing.zero
 
- public override val one: MST.Numeric
- get() = MstRing.one
+ public override val one: MST.Numeric get() = MstRing.one
 
  public override fun bindSymbol(value: String): MST.Symbolic = MstRing.bindSymbol(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)
- public override fun multiply(a: MST, k: Number): MST.Binary = MstRing.multiply(a, k)
+
+ public override fun scale(a: MST, value: Double): MST.Binary =
+ MstSpace.binaryOperationFunction(RingOperations.TIMES_OPERATION)(a, MstSpace.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 =
  binaryOperationFunction(FieldOperations.DIV_OPERATION)(a, b)
@@ -107,11 +109,8 @@ public object MstField : Field<MST>, RingWithNumbers<MST> {
  * [ExtendedField] over [MST] nodes.
  */
 public object MstExtendedField : ExtendedField<MST>, NumericAlgebra<MST> {
- public override val zero: MST.Numeric
- get() = MstField.zero
-
- public override val one: MST.Numeric
- get() = MstField.one
+ public override val zero: MST.Numeric = MstField.zero
+ public override val one: MST.Numeric = MstField.one
 
  public override fun bindSymbol(value: String): MST.Symbolic = MstField.bindSymbol(value)
  public override fun number(value: Number): MST.Numeric = MstRing.number(value)
@@ -121,14 +120,17 @@ public object MstExtendedField : ExtendedField<MST>, NumericAlgebra<MST> {
  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(HyperbolicOperations.SINH_OPERATION)(arg)
- public override fun cosh(arg: MST): MST.Unary = unaryOperationFunction(HyperbolicOperations.COSH_OPERATION)(arg)
- public override fun tanh(arg: MST): MST.Unary = unaryOperationFunction(HyperbolicOperations.TANH_OPERATION)(arg)
- public override fun asinh(arg: MST): MST.Unary = unaryOperationFunction(HyperbolicOperations.ASINH_OPERATION)(arg)
- public override fun acosh(arg: MST): MST.Unary = unaryOperationFunction(HyperbolicOperations.ACOSH_OPERATION)(arg)
- public override fun atanh(arg: MST): MST.Unary = unaryOperationFunction(HyperbolicOperations.ATANH_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 multiply(a: MST, k: Number): MST.Binary = MstField.multiply(a, k)
+
+ public override fun scale(a: MST, value: Double): MST =
+ binaryOperation(SpaceOperations.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 }

kmath-ast/src/jsTest/kotlin/space/kscience/kmath/estree/TestESTreeConsistencyWithInterpreter.kt

@@ -15,9 +15,9 @@ internal class TestESTreeConsistencyWithInterpreter {
  val res1 = MstSpace.mstInSpace {
  binaryOperationFunction("+")(
  unaryOperationFunction("+")(
- number(3.toByte()) - (number(2.toByte()) + (multiply(
+ number(3.toByte()) - (number(2.toByte()) + (scale(
  add(number(1), number(1)),
- 2
+ 2.0
  ) + number(1.toByte()) * 3.toByte() - number(1.toByte())))
  ),
 
@@ -28,9 +28,9 @@ internal class TestESTreeConsistencyWithInterpreter {
  val res2 = MstSpace.mstInSpace {
  binaryOperationFunction("+")(
  unaryOperationFunction("+")(
- number(3.toByte()) - (number(2.toByte()) + (multiply(
+ number(3.toByte()) - (number(2.toByte()) + (scale(
  add(number(1), number(1)),
- 2
+ 2.0
  ) + number(1.toByte()) * 3.toByte() - number(1.toByte())))
  ),
 
@@ -46,9 +46,9 @@ internal class TestESTreeConsistencyWithInterpreter {
  val res1 = ByteRing.mstInRing {
  binaryOperationFunction("+")(
  unaryOperationFunction("+")(
- (bindSymbol("x") - (2.toByte() + (multiply(
+ (bindSymbol("x") - (2.toByte() + (scale(
  add(number(1), number(1)),
- 2
+ 2.0
  ) + 1.toByte()))) * 3.0 - 1.toByte()
  ),
 
@@ -59,9 +59,9 @@ internal class TestESTreeConsistencyWithInterpreter {
  val res2 = ByteRing.mstInRing {
  binaryOperationFunction("+")(
  unaryOperationFunction("+")(
- (bindSymbol("x") - (2.toByte() + (multiply(
+ (bindSymbol("x") - (2.toByte() + (scale(
  add(number(1), number(1)),
- 2
+ 2.0
  ) + 1.toByte()))) * 3.0 - 1.toByte()
  ),
  number(1)
@@ -75,15 +75,15 @@ internal class TestESTreeConsistencyWithInterpreter {
  fun realField() {
  val res1 = RealField.mstInField {
  +(3 - 2 + 2 * number(1) + 1.0) + binaryOperationFunction("+")(
- (3.0 - (bindSymbol("x") + (multiply(add(number(1.0), number(1.0)), 2) + 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
  }("x" to 2.0)
 
  val res2 = RealField.mstInField {
  +(3 - 2 + 2 * number(1) + 1.0) + binaryOperationFunction("+")(
- (3.0 - (bindSymbol("x") + (multiply(add(number(1.0), number(1.0)), 2) + 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
@@ -96,15 +96,15 @@ internal class TestESTreeConsistencyWithInterpreter {
  fun complexField() {
  val res1 = ComplexField.mstInField {
  +(3 - 2 + 2 * number(1) + 1.0) + binaryOperationFunction("+")(
- (3.0 - (bindSymbol("x") + (multiply(add(number(1.0), number(1.0)), 2) + 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
  }("x" to 2.0.toComplex())
 
  val res2 = ComplexField.mstInField {
  +(3 - 2 + 2 * number(1) + 1.0) + binaryOperationFunction("+")(
- (3.0 - (bindSymbol("x") + (multiply(add(number(1.0), number(1.0)), 2) + 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