From 257601d945a55ef225fce2aafdc9d5a28aece1c1 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 1 Nov 2019 14:53:58 +0300
Subject: [PATCH] Changed parameter order in ActionEnv

---
 .../commonMain/kotlin/hep/dataforge/data/MapAction.kt | 11 +++++++++--
 .../kotlin/hep/dataforge/data/ReduceAction.kt         |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/MapAction.kt b/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/MapAction.kt
index ea24ca77..8c543927 100644
--- a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/MapAction.kt
+++ b/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/MapAction.kt
@@ -7,7 +7,14 @@ import hep.dataforge.meta.seal
 import hep.dataforge.names.Name
 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
                  */
-                val env = ActionEnv(name, meta, data.meta)
+                val env = ActionEnv(name, data.meta, meta)
 
                 //applying transformation from builder
                 val builder = MapActionBuilder<T, R>(
diff --git a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/ReduceAction.kt b/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/ReduceAction.kt
index 1ce6d3c2..9bb49151 100644
--- a/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/ReduceAction.kt
+++ b/dataforge-data/src/commonMain/kotlin/hep/dataforge/data/ReduceAction.kt
@@ -90,7 +90,7 @@ class ReduceAction<T : Any, R : Any>(
 
                 val groupMeta = group.meta
 
-                val env = ActionEnv(groupName.toName(), meta, groupMeta)
+                val env = ActionEnv(groupName.toName(), groupMeta, meta)
 
                 val res: DynamicData<R> = dataMap.reduce(
                     outputType,