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

Changed parameter order in ActionEnv

Browse Source
This commit is contained in:
Alexander Nozik 2019-11-01 14:53:58 +03:00
parent 592f911db7
commit 257601d945
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dataforge-data/src/commonMain/kotlin/hep/dataforge/data/MapAction.kt
View File

@ -7,7 +7,14 @@ import hep.dataforge.meta.seal
import hep.dataforge.names.Name import hep.dataforge.names.Name
import kotlin.reflect.KClass import kotlin.reflect.KClass
data class ActionEnv(val name: Name, val actionMeta: Meta, val meta: Meta) /**
* Action environment includes data name, data meta and action configuration meta
*/
data class ActionEnv(
val name: Name,
val meta: Meta,
val actionMeta: Meta
)
/** /**
@ -39,7 +46,7 @@ class MapAction<T : Any, out R : Any>(
/* /*
* Creating a new environment for action using **old** name, old meta and task meta * Creating a new environment for action using **old** name, old meta and task meta
*/ */
val env = ActionEnv(name, meta, data.meta) val env = ActionEnv(name, data.meta, meta)
//applying transformation from builder //applying transformation from builder
val builder = MapActionBuilder<T, R>( val builder = MapActionBuilder<T, R>(

2
dataforge-data/src/commonMain/kotlin/hep/dataforge/data/ReduceAction.kt
View File

@ -90,7 +90,7 @@ class ReduceAction<T : Any, R : Any>(
val groupMeta = group.meta val groupMeta = group.meta
val env = ActionEnv(groupName.toName(), meta, groupMeta) val env = ActionEnv(groupName.toName(), groupMeta, meta)
val res: DynamicData<R> = dataMap.reduce( val res: DynamicData<R> = dataMap.reduce(
outputType, outputType,