Merge dev into master #59

Merged
altavir merged 37 commits from dev into master 2019-05-31 12:35:58 +03:00
12 changed files with 48 additions and 16 deletions
Showing only changes of commit da4a756a4d - Show all commits

View File

@ -7,7 +7,7 @@ description = "Commons math binding for kmath"
dependencies { dependencies {
api(project(":kmath-core")) api(project(":kmath-core"))
api(project(":kmath-sequential")) api(project(":kmath-streaming"))
api("org.apache.commons:commons-math3:3.6.1") api("org.apache.commons:commons-math3:3.6.1")
testImplementation("org.jetbrains.kotlin:kotlin-test") testImplementation("org.jetbrains.kotlin:kotlin-test")
testImplementation("org.jetbrains.kotlin:kotlin-test-junit") testImplementation("org.jetbrains.kotlin:kotlin-test-junit")

View File

@ -2,9 +2,9 @@ package scientifik.kmath.transform
import org.apache.commons.math3.transform.* import org.apache.commons.math3.transform.*
import scientifik.kmath.operations.Complex import scientifik.kmath.operations.Complex
import scientifik.kmath.sequential.Processor import scientifik.kmath.streaming.Processor
import scientifik.kmath.sequential.Producer import scientifik.kmath.streaming.Producer
import scientifik.kmath.sequential.map import scientifik.kmath.streaming.map
import scientifik.kmath.structures.* import scientifik.kmath.structures.*

View File

@ -0,0 +1,36 @@
plugins {
kotlin("multiplatform")
id("kotlinx-atomicfu")
}
val atomicfuVersion: String by rootProject.extra
kotlin {
jvm ()
js()
sourceSets {
val commonMain by getting {
dependencies {
api(project(":kmath-core"))
api(project(":kmath-coroutines"))
compileOnly("org.jetbrains.kotlinx:atomicfu-common:${Ver.atomicfuVersion}")
}
}
val jvmMain by getting {
dependencies {
compileOnly("org.jetbrains.kotlinx:atomicfu:${Ver.atomicfuVersion}")
}
}
val jsMain by getting {
dependencies {
compileOnly("org.jetbrains.kotlinx:atomicfu-js:${Ver.atomicfuVersion}")
}
}
}
}
atomicfu {
variant = "VH"
}

View File

@ -1,4 +1,4 @@
package scientifik.kmath.sequential package scientifik.kmath.streaming
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.ExperimentalCoroutinesApi

View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package scientifik.kmath.sequential package scientifik.kmath.streaming
import kotlinx.atomicfu.atomic import kotlinx.atomicfu.atomic
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope

View File

@ -1,4 +1,4 @@
package scientifik.kmath.sequential package scientifik.kmath.streaming
import scientifik.kmath.operations.Space import scientifik.kmath.operations.Space
import kotlin.jvm.JvmName import kotlin.jvm.JvmName

View File

@ -1,4 +1,4 @@
package scientifik.kmath.sequential package scientifik.kmath.streaming
import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock import kotlinx.coroutines.sync.withLock

View File

@ -1,4 +1,4 @@
package scientifik.kmath.sequential package scientifik.kmath.streaming
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.GlobalScope

View File

@ -1,8 +1,6 @@
package scientifik.kmath.misc package scientifik.kmath.misc
import scientifik.kmath.sequential.cumulativeSum import scientifik.kmath.streaming.cumulativeSum
import kotlin.test.Test
import kotlin.test.assertEquals
class CumulativeKtTest { class CumulativeKtTest {
@Test @Test

View File

@ -1,4 +1,4 @@
package scientifik.kmath.sequential package scientifik.kmath.streaming
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
import kotlin.sequences.Sequence import kotlin.sequences.Sequence

View File

@ -1,9 +1,7 @@
package scientifik.kmath.sequential package scientifik.kmath.streaming
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
import scientifik.kmath.structures.asSequence import scientifik.kmath.structures.asSequence
import kotlin.test.Test
import kotlin.test.assertEquals
class RingBufferTest { class RingBufferTest {
@Test @Test