Functional, no mapping done. Tests to be added and fixed.

kleis-technology · Jul 24, 2023 · 5dd9ff5 · 5dd9ff5
1 parent c4aa798
commit 5dd9ff5
Show file tree

Hide file tree

Showing 11 changed files with 266 additions and 177 deletions.
diff --git a/src/main/kotlin/ch/kleis/lcaplugin/actions/AssessProcessAction.kt b/src/main/kotlin/ch/kleis/lcaplugin/actions/AssessProcessAction.kt
@@ -42,7 +42,7 @@ class AssessProcessAction(
 
             override fun run(indicator: ProgressIndicator) {
                 val trace = traceSystemWithIndicator(indicator, file, processName, matchLabels)
-                val order = trace.getProductOrder()
+                val order = trace.getObservableOrder()
                 val inventory = Assessment(trace.getSystemValue(), trace.getEntryPoint()).inventory()
                 this.data = Pair(inventory, order)
             }

diff --git a/src/main/kotlin/ch/kleis/lcaplugin/core/lang/evaluator/EvaluationTrace.kt b/src/main/kotlin/ch/kleis/lcaplugin/core/lang/evaluator/EvaluationTrace.kt
@@ -7,19 +7,19 @@ class EvaluationTrace {
     private var currentStage = HashSet<MatrixRowIndex>()
     private val processes = HashSet<ProcessValue>()
     private val substanceCharacterizations = HashSet<SubstanceCharacterizationValue>()
-    private val productDepthMap = HashMap<MatrixColumnIndex, Int>()
+    private val observableDepthMap = HashMap<MatrixColumnIndex, Int>()
 
     companion object {
         fun empty(): EvaluationTrace {
             return EvaluationTrace()
         }
     }
 
-    fun getProductOrder(): Comparator<MatrixColumnIndex> {
+    fun getObservableOrder(): Comparator<MatrixColumnIndex> {
         return object : Comparator<MatrixColumnIndex> {
             override fun compare(o1: MatrixColumnIndex, o2: MatrixColumnIndex): Int {
-                val d1 = productDepthMap[o1] ?: throw EvaluatorException("unknown ${o1}")
-                val d2 = productDepthMap[o2] ?: throw EvaluatorException("unknown ${o2}")
+                val d1 = observableDepthMap[o1] ?: throw EvaluatorException("unknown ${o1}")
+                val d2 = observableDepthMap[o2] ?: throw EvaluatorException("unknown ${o2}")
                 if (d1 < d2) {
                     return -1
                 }
@@ -94,13 +94,13 @@ class EvaluationTrace {
             .filterIsInstance<ProcessValue>()
             .forEach { process ->
                 process.products.forEach { exchange ->
-                    productDepthMap[exchange.product] = currentDepth
+                    observableDepthMap[exchange.product] = currentDepth
                 }
             }
         currentStage
             .filterIsInstance<SubstanceCharacterizationValue>()
             .forEach { sc ->
-                productDepthMap[sc.referenceExchange.substance] = currentDepth
+                observableDepthMap[sc.referenceExchange.substance] = currentDepth
             }
 
         stages.add(currentStage)

diff --git a/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/EcoSpold2ProcessMapper.kt b/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/EcoSpold2ProcessMapper.kt
@@ -1,11 +1,14 @@
 package ch.kleis.lcaplugin.imports.ecospold
 
+import ch.kleis.lcaplugin.core.lang.expression.SubstanceType
 import ch.kleis.lcaplugin.imports.ModelWriter
 import ch.kleis.lcaplugin.imports.ecospold.lcia.EcospoldImporter.Companion.unitToStr
 import ch.kleis.lcaplugin.imports.ecospold.model.ActivityDataset
+import ch.kleis.lcaplugin.imports.ecospold.model.ElementaryExchange
 import ch.kleis.lcaplugin.imports.ecospold.model.IntermediateExchange
 import ch.kleis.lcaplugin.imports.ecospold.model.Uncertainty
 import ch.kleis.lcaplugin.imports.model.ExchangeBlock
+import ch.kleis.lcaplugin.imports.model.ImportedBioExchange
 import ch.kleis.lcaplugin.imports.model.ImportedProcess
 import ch.kleis.lcaplugin.imports.model.ImportedProductExchange
 import ch.kleis.lcaplugin.imports.simapro.sanitizeSymbol
@@ -36,7 +39,7 @@ open class EcoSpold2ProcessMapper(val process: ActivityDataset) {
         mapInputs()
         mapLandUse()
         mapResources()
-        mapEmission()
+        mapEmissions()
 
         return result
     }
@@ -48,11 +51,46 @@ open class EcoSpold2ProcessMapper(val process: ActivityDataset) {
         result.productBlocks = mutableListOf(ExchangeBlock("Products", products))
     }
 
-    open fun mapEmission() {}
-    open fun mapInputs() {}
-    open fun mapLandUse() {}
-    open fun mapResources() {}
+    private fun mapEmissions() {
+        result.emissionBlocks += ExchangeBlock("FIXME",
+                process.flowData.elementaryExchanges
+                        .filter { it.substanceType == SubstanceType.EMISSION }
+                        .map(::elementaryExchangeToImportedBioExchange).toMutableList()
+        )
+
+        // TODO: Remove when closing #261
+        val bio = ImportedBioExchange(listOf(), "1.0", "u", pUid, "")
+        result.emissionBlocks += ExchangeBlock("Virtual Substance for Impact Factors", mutableListOf(bio))
+
+    }
+
+    private fun mapLandUse() {
+        result.landUseBlocks = mutableListOf(ExchangeBlock("FIXME",
+                process.flowData.elementaryExchanges
+                        .filter { it.substanceType == SubstanceType.LAND_USE }
+                        .map(::elementaryExchangeToImportedBioExchange).toMutableList()
+        ))
+    }
+
+    private fun mapResources() {
+        result.resourceBlocks = mutableListOf(ExchangeBlock("FIXME",
+                process.flowData.elementaryExchanges
+                        .filter { it.substanceType == SubstanceType.RESOURCE }
+                        .map(::elementaryExchangeToImportedBioExchange).toMutableList()
+        ))
+    }
 
+    private fun elementaryExchangeToImportedBioExchange(elementaryExchange: ElementaryExchange): ImportedBioExchange =
+            ImportedBioExchange(
+                    comments = elementaryExchange.comment?.let { listOf(it) } ?: listOf(),
+                    qty = elementaryExchange.amount.toString(),
+                    unit = elementaryExchange.unit,
+                    uid = ModelWriter.sanitizeAndCompact(elementaryExchange.name),
+                    compartment = elementaryExchange.compartment,
+                    subCompartment = elementaryExchange.subCompartment,
+            )
+
+    open fun mapInputs() {}
 
     open fun mapMetas() {
         val metas = result.meta

diff --git a/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/Ecospold2ProcessRenderer.kt b/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/Ecospold2ProcessRenderer.kt
@@ -1,6 +1,7 @@
 package ch.kleis.lcaplugin.imports.ecospold.lcia
 
 import ch.kleis.lcaplugin.imports.ModelWriter
+import ch.kleis.lcaplugin.imports.ecospold.EcoSpold2ProcessMapper
 import ch.kleis.lcaplugin.imports.ecospold.lcia.EcospoldImporter.ProcessDictRecord
 import ch.kleis.lcaplugin.imports.ecospold.model.ActivityDataset
 import ch.kleis.lcaplugin.imports.shared.serializer.ProcessSerializer
@@ -19,28 +20,28 @@ class Ecospold2ProcessRenderer {
         val category = category(data)
 
         val subFolder = if (category == null) "" else "${category}${File.separatorChar}"
-        val process = LciaProcessMapper(data).map()
+        val process = EcoSpold2ProcessMapper(data).map()
         process.comments.add(processComment)
         val strProcess = ProcessSerializer.serialize(process)
 
         w.write(
-            "processes${File.separatorChar}$subFolder${process.uid}.lca",
-            strProcess, index = false, closeAfterWrite = false
+                "processes${File.separatorChar}$subFolder${process.uid}.lca",
+                strProcess, index = false, closeAfterWrite = false
         )
         val substance = EcoSpold2SubstanceMapper.map(data, methodName)
         val strSubstance = SubstanceSerializer.serialize(substance)
         w.write(
-            "processes${File.separatorChar}$subFolder${process.uid}.lca",
-            strSubstance, index = false, closeAfterWrite = true
+                "processes${File.separatorChar}$subFolder${process.uid}.lca",
+                strSubstance, index = false, closeAfterWrite = true
         )
 
 
     }
 
     private fun category(data: ActivityDataset): String? {
         val desc = data.description.classifications
-            .firstOrNull { it.system == "EcoSpold01Categories" }
-            ?.value
+                .firstOrNull { it.system == "EcoSpold01Categories" }
+                ?.value
         return desc?.let { ModelWriter.sanitizeAndCompact(it) }
     }
 

diff --git a/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/LciaProcessMapper.kt b/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/LciaProcessMapper.kt
diff --git a/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/model/FlowData.kt b/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/model/FlowData.kt
@@ -2,6 +2,7 @@ package ch.kleis.lcaplugin.imports.ecospold.model
 
 
 data class FlowData(
-    val intermediateExchanges: List<IntermediateExchange> = ArrayList(),
-    val impactIndicators: List<ImpactIndicator>
+        val intermediateExchanges: List<IntermediateExchange> = ArrayList(),
+        val impactIndicators: List<ImpactIndicator>,
+        val elementaryExchanges: Sequence<ElementaryExchange>,
 )