kscience/dataforge-core
8
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases 12 Wiki Activity

kotlin to 1.3.20

Browse Source
This commit is contained in:
Alexander Nozik 2019-01-27 15:54:13 +03:00
parent 25248f6cca
commit 64a23545f7
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.gradle.kts
View File

@ -1,8 +1,8 @@
buildscript { buildscript {
extra["kotlinVersion"] = "1.3.11" extra["kotlinVersion"] = "1.3.20"
extra["ioVersion"] = "0.1.2" extra["ioVersion"] = "0.1.2"
extra["serializationVersion"] = "0.9.1" extra["serializationVersion"] = "0.9.1"
extra["coroutinesVersion"] = "1.1.0" extra["coroutinesVersion"] = "1.1.1"
val kotlinVersion: String by extra val kotlinVersion: String by extra
val ioVersion: String by extra val ioVersion: String by extra
@ -35,7 +35,7 @@ allprojects {
} }
group = "hep.dataforge" group = "hep.dataforge"
version = "0.1.1-dev-1" version = "0.1.1-dev-2"
} }
if (file("artifactory.gradle").exists()) { if (file("artifactory.gradle").exists()) {

3
dataforge-data/src/commonMain/kotlin/hep/dataforge/data/Goal.kt
View File

@ -63,13 +63,14 @@ private class StaticGoalImpl<T>(val context: CoroutineContext, deferred: Complet
override val totalWork: Double get() = 0.0 override val totalWork: Double get() = 0.0
override val workDone: Double get() = 0.0 override val workDone: Double get() = 0.0
override val coroutineContext: CoroutineContext get() = context override val coroutineContext: CoroutineContext get() = context
} }
/** /**
* Create a new [Goal] with given [dependencies] and execution [block]. The block takes monitor as parameter. * Create a new [Goal] with given [dependencies] and execution [block]. The block takes monitor as parameter.
* The goal block runs in a supervised scope, meaning that when it fails, it won't affect external scope. * The goal block runs in a supervised scope, meaning that when it fails, it won't affect external scope.
*
* **Important:** Unlike regular deferred, the [Goal] is started lazily, so the actual calculation is called only when result is requested.
*/ */
fun <R> CoroutineScope.createGoal(dependencies: Collection<Goal<*>>, block: suspend GoalMonitor.() -> R): Goal<R> { fun <R> CoroutineScope.createGoal(dependencies: Collection<Goal<*>>, block: suspend GoalMonitor.() -> R): Goal<R> {
val monitor = GoalMonitor() val monitor = GoalMonitor()

5
dataforge-io/src/commonMain/kotlin/hep/dataforge/io/Output.kt
View File

@ -1,13 +1,8 @@
package hep.dataforge.io package hep.dataforge.io
import hep.dataforge.context.Context
import hep.dataforge.context.ContextAware import hep.dataforge.context.ContextAware
import hep.dataforge.meta.EmptyMeta import hep.dataforge.meta.EmptyMeta
import hep.dataforge.meta.Meta import hep.dataforge.meta.Meta
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
import kotlin.reflect.KClass
/** /**
* A generic way to render any object in the output. * A generic way to render any object in the output.