From dce9199b7888b967175b74a29f0f5e00b693109d Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Tue, 29 Oct 2019 20:21:38 +0300
Subject: [PATCH] #18

---
 .../kotlin/hep/dataforge/data/Data.kt         | 12 +++++-----
 .../kotlin/hep/dataforge/data/Goal.kt         |  8 +++----
 .../data/{PipeAction.kt => MapAction.kt}      | 16 ++++++-------
 .../data/{JoinAction.kt => ReduceAction.kt}   | 10 ++++----
 .../kotlin/hep/dataforge/data/SplitAction.kt  |  2 +-
 .../hep/dataforge/workspace/TaskBuilder.kt    | 24 +++++++++----------
 .../workspace/SimpleWorkspaceTest.kt          | 16 ++++++-------
 7 files changed, 44 insertions(+), 44 deletions(-)
 rename dataforge-data/src/commonMain/kotlin/hep/dataforge/data/{PipeAction.kt => MapAction.kt} (70%)
 rename dataforge-data/src/commonMain/kotlin/hep/dataforge/data/{JoinAction.kt => ReduceAction.kt} (87%)

diff --git a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/Data.kt b/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/Data.kt
index bd93ddfc..e15a5210 100644
--- a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/Data.kt
+++ b/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/Data.kt
@@ -85,7 +85,7 @@ class StaticData<T : Any>(
 
 class NamedData<out T : Any>(val name: String, data: Data<T>) : Data<T> by data
 
-fun <T : Any, R : Any> Data<T>.pipe(
+fun <T : Any, R : Any> Data<T>.map(
     outputType: KClass<out R>,
     coroutineContext: CoroutineContext = EmptyCoroutineContext,
     meta: Meta = this.meta,
@@ -98,7 +98,7 @@ fun <T : Any, R : Any> Data<T>.pipe(
 /**
  * Create a data pipe
  */
-inline fun <T : Any, reified R : Any> Data<T>.pipe(
+inline fun <T : Any, reified R : Any> Data<T>.map(
     coroutineContext: CoroutineContext = EmptyCoroutineContext,
     meta: Meta = this.meta,
     noinline block: suspend CoroutineScope.(T) -> R
@@ -109,7 +109,7 @@ inline fun <T : Any, reified R : Any> Data<T>.pipe(
 /**
  * Create a joined data.
  */
-inline fun <T : Any, reified R : Any> Collection<Data<T>>.join(
+inline fun <T : Any, reified R : Any> Collection<Data<T>>.reduce(
     coroutineContext: CoroutineContext = EmptyCoroutineContext,
     meta: Meta,
     noinline block: suspend CoroutineScope.(Collection<T>) -> R
@@ -119,10 +119,10 @@ inline fun <T : Any, reified R : Any> Collection<Data<T>>.join(
     coroutineContext,
     this
 ) {
-    block(map { this.run { it.await(this) } })
+    block(map { run { it.await(this) } })
 }
 
-fun <K, T : Any, R : Any> Map<K, Data<T>>.join(
+fun <K, T : Any, R : Any> Map<K, Data<T>>.reduce(
     outputType: KClass<out R>,
     coroutineContext: CoroutineContext = EmptyCoroutineContext,
     meta: Meta,
@@ -143,7 +143,7 @@ fun <K, T : Any, R : Any> Map<K, Data<T>>.join(
  * @param T type of the input goal
  * @param R type of the result goal
  */
-inline fun <K, T : Any, reified R : Any> Map<K, Data<T>>.join(
+inline fun <K, T : Any, reified R : Any> Map<K, Data<T>>.reduce(
     coroutineContext: CoroutineContext = EmptyCoroutineContext,
     meta: Meta,
     noinline block: suspend CoroutineScope.(Map<K, T>) -> R
diff --git a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/Goal.kt b/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/Goal.kt
index 54bb743e..8275d31e 100644
--- a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/Goal.kt
+++ b/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/Goal.kt
@@ -85,7 +85,7 @@ open class DynamicGoal<T>(
 /**
  * Create a one-to-one goal based on existing goal
  */
-fun <T, R> Goal<T>.pipe(
+fun <T, R> Goal<T>.map(
     coroutineContext: CoroutineContext = EmptyCoroutineContext,
     block: suspend CoroutineScope.(T) -> R
 ): Goal<R> = DynamicGoal(coroutineContext, listOf(this)) {
@@ -95,11 +95,11 @@ fun <T, R> Goal<T>.pipe(
 /**
  * Create a joining goal.
  */
-fun <T, R> Collection<Goal<T>>.join(
+fun <T, R> Collection<Goal<T>>.reduce(
     coroutineContext: CoroutineContext = EmptyCoroutineContext,
     block: suspend CoroutineScope.(Collection<T>) -> R
 ): Goal<R> = DynamicGoal(coroutineContext, this) {
-    block(map { this.run { it.await(this) } })
+    block(map { run { it.await(this) } })
 }
 
 /**
@@ -108,7 +108,7 @@ fun <T, R> Collection<Goal<T>>.join(
  * @param T type of the input goal
  * @param R type of the result goal
  */
-fun <K, T, R> Map<K, Goal<T>>.join(
+fun <K, T, R> Map<K, Goal<T>>.reduce(
     coroutineContext: CoroutineContext = EmptyCoroutineContext,
     block: suspend CoroutineScope.(Map<K, T>) -> R
 ): Goal<R> = DynamicGoal(coroutineContext, this.values) {
diff --git a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/PipeAction.kt b/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/MapAction.kt
similarity index 70%
rename from dataforge-data/src/commonMain/kotlin/hep/dataforge/data/PipeAction.kt
rename to dataforge-data/src/commonMain/kotlin/hep/dataforge/data/MapAction.kt
index 91a204d8..b184a2a8 100644
--- a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/PipeAction.kt
+++ b/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/MapAction.kt
@@ -10,7 +10,7 @@ class ActionEnv(val name: Name, val meta: Meta)
 /**
  * Action environment
  */
-class PipeBuilder<T, R>(var name: Name, var meta: MetaBuilder) {
+class MapActionBuilder<T, R>(var name: Name, var meta: MetaBuilder) {
     lateinit var result: suspend ActionEnv.(T) -> R
 
     /**
@@ -22,10 +22,10 @@ class PipeBuilder<T, R>(var name: Name, var meta: MetaBuilder) {
 }
 
 
-class PipeAction<T : Any, out R : Any>(
+class MapAction<T : Any, out R : Any>(
     val inputType: KClass<out T>,
     val outputType: KClass<out R>,
-    private val block: PipeBuilder<T, R>.() -> Unit
+    private val block: MapActionBuilder<T, R>.() -> Unit
 ) : Action<T, R> {
 
     override fun invoke(node: DataNode<T>, meta: Meta): DataNode<R> {
@@ -38,12 +38,12 @@ class PipeAction<T : Any, out R : Any>(
                 // creating environment from old meta and name
                 val env = ActionEnv(name, oldMeta)
                 //applying transformation from builder
-                val builder = PipeBuilder<T, R>(name, oldMeta).apply(block)
+                val builder = MapActionBuilder<T, R>(name, oldMeta).apply(block)
                 //getting new name
                 val newName = builder.name
                 //getting new meta
                 val newMeta = builder.meta.seal()
-                val newData = data.pipe(outputType, meta = newMeta) { builder.result(env, it) }
+                val newData = data.map(outputType, meta = newMeta) { builder.result(env, it) }
                 //setting the data node
                 this[newName] = newData
             }
@@ -51,10 +51,10 @@ class PipeAction<T : Any, out R : Any>(
     }
 }
 
-inline fun <reified T : Any, reified R : Any> DataNode<T>.pipe(
+inline fun <reified T : Any, reified R : Any> DataNode<T>.map(
     meta: Meta,
-    noinline action: PipeBuilder<in T, out R>.() -> Unit
-): DataNode<R> = PipeAction(T::class, R::class, action).invoke(this, meta)
+    noinline action: MapActionBuilder<in T, out R>.() -> Unit
+): DataNode<R> = MapAction(T::class, R::class, action).invoke(this, meta)
 
 
 
diff --git a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/JoinAction.kt b/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/ReduceAction.kt
similarity index 87%
rename from dataforge-data/src/commonMain/kotlin/hep/dataforge/data/JoinAction.kt
rename to dataforge-data/src/commonMain/kotlin/hep/dataforge/data/ReduceAction.kt
index 7ad4055e..48738452 100644
--- a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/JoinAction.kt
+++ b/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/ReduceAction.kt
@@ -21,7 +21,7 @@ class JoinGroup<T : Any, R : Any>(var name: String, internal val node: DataNode<
 
 }
 
-class JoinGroupBuilder<T : Any, R : Any>(val actionMeta: Meta) {
+class ReduceGroupBuilder<T : Any, R : Any>(val actionMeta: Meta) {
     private val groupRules: MutableList<(DataNode<T>) -> List<JoinGroup<T, R>>> = ArrayList();
 
     /**
@@ -73,16 +73,16 @@ class JoinGroupBuilder<T : Any, R : Any>(val actionMeta: Meta) {
 /**
  * The same rules as for KPipe
  */
-class JoinAction<T : Any, R : Any>(
+class ReduceAction<T : Any, R : Any>(
     val inputType: KClass<out T>,
     val outputType: KClass<out R>,
-    private val action: JoinGroupBuilder<T, R>.() -> Unit
+    private val action: ReduceGroupBuilder<T, R>.() -> Unit
 ) : Action<T, R> {
 
     override fun invoke(node: DataNode<T>, meta: Meta): DataNode<R> {
         node.ensureType(inputType)
         return DataNode.invoke(outputType) {
-            JoinGroupBuilder<T, R>(meta).apply(action).buildGroups(node).forEach { group ->
+            ReduceGroupBuilder<T, R>(meta).apply(action).buildGroups(node).forEach { group ->
 
                 val laminate = Laminate(group.meta, meta)
 
@@ -92,7 +92,7 @@ class JoinAction<T : Any, R : Any>(
 
                 val env = ActionEnv(groupName.toName(), laminate.builder())
 
-                val res: DynamicData<R> = dataMap.join(outputType, meta = laminate) { group.result.invoke(env, it) }
+                val res: DynamicData<R> = dataMap.reduce(outputType, meta = laminate) { group.result.invoke(env, it) }
 
                 set(env.name, res)
             }
diff --git a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/SplitAction.kt b/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/SplitAction.kt
index 637baeeb..a4f82931 100644
--- a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/SplitAction.kt
+++ b/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/SplitAction.kt
@@ -55,7 +55,7 @@ class SplitAction<T : Any, R : Any>(
 
                     rule(env)
 
-                    val res = data.pipe(outputType, meta = env.meta) { env.result(it) }
+                    val res = data.map(outputType, meta = env.meta) { env.result(it) }
                     set(env.name, res)
                 }
             }
diff --git a/dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/TaskBuilder.kt b/dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/TaskBuilder.kt
index 150d56a6..80d89e24 100644
--- a/dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/TaskBuilder.kt
+++ b/dataforge-workspace/src/commonMain/kotlin/hep/dataforge/workspace/TaskBuilder.kt
@@ -105,15 +105,15 @@ class TaskBuilder<R : Any>(val name: Name, val type: KClass<out R>) {
     }
 
     /**
-     * A customized pipe action with ability to change meta and name
+     * A customized map action with ability to change meta and name
      */
-    inline fun <reified T : Any> customPipe(
+    inline fun <reified T : Any> mapAction(
         from: String = "",
         to: String = "",
-        crossinline block: PipeBuilder<T, R>.(TaskEnv) -> Unit
+        crossinline block: MapActionBuilder<T, R>.(TaskEnv) -> Unit
     ) {
         action(from, to) {
-            PipeAction(
+            MapAction(
                 inputType = T::class,
                 outputType = type
             ) { block(this@action) }
@@ -121,15 +121,15 @@ class TaskBuilder<R : Any>(val name: Name, val type: KClass<out R>) {
     }
 
     /**
-     * A simple pipe action without changing meta or name
+     * A simple map action without changing meta or name
      */
-    inline fun <reified T : Any> pipe(
+    inline fun <reified T : Any> map(
         from: String = "",
         to: String = "",
         crossinline block: suspend TaskEnv.(T) -> R
     ) {
         action(from, to) {
-            PipeAction(
+            MapAction(
                 inputType = T::class,
                 outputType = type
             ) {
@@ -144,13 +144,13 @@ class TaskBuilder<R : Any>(val name: Name, val type: KClass<out R>) {
     /**
      * Join elements in gathered data by multiple groups
      */
-    inline fun <reified T : Any> joinByGroup(
+    inline fun <reified T : Any> reduceByGroup(
         from: String = "",
         to: String = "",
-        crossinline block: JoinGroupBuilder<T, R>.(TaskEnv) -> Unit        //TODO needs KEEP-176
+        crossinline block: ReduceGroupBuilder<T, R>.(TaskEnv) -> Unit        //TODO needs KEEP-176
     ) {
         action(from, to) {
-            JoinAction(
+            ReduceAction(
                 inputType = T::class,
                 outputType = type
             ) { block(this@action) }
@@ -160,13 +160,13 @@ class TaskBuilder<R : Any>(val name: Name, val type: KClass<out R>) {
     /**
      * Join all elemlents in gathered data matching input type
      */
-    inline fun <reified T : Any> join(
+    inline fun <reified T : Any> reduce(
         from: String = "",
         to: String = "",
         crossinline block: suspend TaskEnv.(Map<Name, T>) -> R
     ) {
         action(from, to) {
-            JoinAction(
+            ReduceAction(
                 inputType = T::class,
                 outputType = type,
                 action = {
diff --git a/dataforge-workspace/src/jvmTest/kotlin/hep/dataforge/workspace/SimpleWorkspaceTest.kt b/dataforge-workspace/src/jvmTest/kotlin/hep/dataforge/workspace/SimpleWorkspaceTest.kt
index 3059cb29..4d37f5d9 100644
--- a/dataforge-workspace/src/jvmTest/kotlin/hep/dataforge/workspace/SimpleWorkspaceTest.kt
+++ b/dataforge-workspace/src/jvmTest/kotlin/hep/dataforge/workspace/SimpleWorkspaceTest.kt
@@ -17,7 +17,7 @@ class SimpleWorkspaceTest {
         override val tag: PluginTag = PluginTag("test")
 
         val contextTask = task("test", Any::class) {
-            pipe<Any> {
+            map<Any> {
                 context.logger.info { "Test: $it" }
             }
         }
@@ -39,13 +39,13 @@ class SimpleWorkspaceTest {
             model {
                 data("myData\\[12\\]")
             }
-            pipe<Int>{
+            map<Int>{
                 it
             }
         }
 
         val square = task<Int>("square") {
-            pipe<Int> { data ->
+            map<Int> { data ->
                 if (meta["testFlag"].boolean == true) {
                     println("flag")
                 }
@@ -55,7 +55,7 @@ class SimpleWorkspaceTest {
         }
 
         val linear = task<Int>("linear") {
-            pipe<Int> { data ->
+            map<Int> { data ->
                 context.logger.info { "Starting linear on $data" }
                 data * 2 + 1
             }
@@ -86,14 +86,14 @@ class SimpleWorkspaceTest {
             model {
                 dependsOn(square)
             }
-            join<Int> { data ->
+            reduce<Int> { data ->
                 context.logger.info { "Starting sum" }
                 data.values.sum()
             }
         }
 
         val average = task<Double>("average") {
-            joinByGroup<Int> { env ->
+            reduceByGroup<Int> { env ->
                 group("even", filter = { name, _ -> name.toString().toInt() % 2 == 0 }) {
                     result { data ->
                         env.context.logger.info { "Starting even" }
@@ -113,13 +113,13 @@ class SimpleWorkspaceTest {
             model {
                 dependsOn(average)
             }
-            join<Double> { data ->
+            reduce<Double> { data ->
                 data["even"]!! - data["odd"]!!
             }
         }
 
         val customPipeTask = task<Int>("custom") {
-            customPipe<Int> {
+            mapAction<Int> {
                 meta = meta.builder().apply {
                     "newValue" to 22
                 }