removed label selector reduce step

kleis-technology · Feb 9, 2024 · 70ac736 · 70ac736
1 parent fbdcf1d
commit 70ac736
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 365 deletions.
diff --git a/core/src/main/kotlin/ch/kleis/lcaac/core/lang/evaluator/protocol/Oracle.kt b/core/src/main/kotlin/ch/kleis/lcaac/core/lang/evaluator/protocol/Oracle.kt
@@ -4,7 +4,6 @@ import ch.kleis.lcaac.core.datasource.DataSourceOperations
 import ch.kleis.lcaac.core.lang.SymbolTable
 import ch.kleis.lcaac.core.lang.evaluator.step.CompleteTerminals
 import ch.kleis.lcaac.core.lang.evaluator.step.Reduce
-import ch.kleis.lcaac.core.lang.evaluator.step.ReduceLabelSelectors
 import ch.kleis.lcaac.core.lang.expression.EProcess
 import ch.kleis.lcaac.core.lang.expression.EProcessTemplateApplication
 import ch.kleis.lcaac.core.lang.resolver.ProcessResolver
@@ -14,9 +13,8 @@ import ch.kleis.lcaac.core.math.QuantityOperations
 class Oracle<Q>(
     val symbolTable: SymbolTable<Q>,
     val ops: QuantityOperations<Q>,
-    private val sourceOps: DataSourceOperations<Q>,
+    sourceOps: DataSourceOperations<Q>,
 ) {
-    private val reduceLabelSelectors = ReduceLabelSelectors(symbolTable, ops, sourceOps)
     private val reduceDataExpressions = Reduce(symbolTable, ops, sourceOps)
     private val completeTerminals = CompleteTerminals(ops)
     private val processResolver = ProcessResolver(symbolTable)
@@ -40,7 +38,6 @@ class Oracle<Q>(
             .plus(spec.fromProcess?.arguments ?: emptyMap())
         val expression = EProcessTemplateApplication(template, arguments)
         val process = expression
-            .let(reduceLabelSelectors::apply)
             .let(reduceDataExpressions::apply)
             .let(completeTerminals::apply)
         val selectedPortIndex = indexOf(request.value.name, process)

diff --git a/core/src/main/kotlin/ch/kleis/lcaac/core/lang/evaluator/reducer/TemplateExpressionReducer.kt b/core/src/main/kotlin/ch/kleis/lcaac/core/lang/evaluator/reducer/TemplateExpressionReducer.kt
@@ -36,6 +36,7 @@ class TemplateExpressionReducer<Q>(
         val localRegister = DataRegister(dataRegister)
             .plus(actualArguments.mapKeys { DataKey(it.key) })
             .plus(template.locals.mapKeys { DataKey(it.key) })
+            .plus(template.body.labels.mapKeys { DataKey(it.key) })
 
         val reducer = LcaExpressionReducer(localRegister, dataSourceRegister, ops, sourceOps)
         val dataReducer = DataExpressionReducer(localRegister, dataSourceRegister, ops, sourceOps)

diff --git a/core/src/main/kotlin/ch/kleis/lcaac/core/lang/evaluator/step/ReduceLabelSelectors.kt b/core/src/main/kotlin/ch/kleis/lcaac/core/lang/evaluator/step/ReduceLabelSelectors.kt
diff --git a/core/src/test/kotlin/ch/kleis/lcaac/core/lang/evaluator/step/ReduceLabelSelectorsTest.kt b/core/src/test/kotlin/ch/kleis/lcaac/core/lang/evaluator/step/ReduceLabelSelectorsTest.kt