En cours

src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/EcoSpold2ProcessMapper.kt

@@ -0,0 +1,108 @@
+package ch.kleis.lcaplugin.imports.ecospold
+
+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.IntermediateExchange
+import ch.kleis.lcaplugin.imports.ecospold.model.Uncertainty
+import ch.kleis.lcaplugin.imports.model.ExchangeBlock
+import ch.kleis.lcaplugin.imports.model.ImportedProcess
+import ch.kleis.lcaplugin.imports.model.ImportedProductExchange
+import ch.kleis.lcaplugin.imports.simapro.sanitizeSymbol
+import ch.kleis.lcaplugin.imports.util.ImportException
+
+open class EcoSpold2ProcessMapper(val process: ActivityDataset) {
+    val pUid = uid(process)
+    val result = ImportedProcess(pUid)
+
+    companion object {
+        fun uid(data: ActivityDataset): String {
+            return datasetUid(data.description.activity.name, data.description.geography?.shortName ?: "")
+        }
+
+        private fun toStr(txt: List<String>): CharSequence {
+            return txt.joinToString("\n")
+        }
+
+        private fun datasetUid(activityName: String, geo: String): String {
+            return ModelWriter.sanitizeAndCompact(activityName + "_" + geo)
+        }
+    }
+
+    fun map(): ImportedProcess {
+
+        mapMetas()
+        mapProducts()
+        mapInputs()
+        mapLandUse()
+        mapResources()
+        mapEmission()
+
+        return result
+    }
+
+    open fun mapProducts() {
+        val geo = if (process.description.geography?.shortName == "GLO") ""
+        else process.description.geography?.shortName ?: ""
+        val products = process.flowData.intermediateExchanges.map { mapProduct(it, geo) }.toMutableList()
+        result.productBlocks = mutableListOf(ExchangeBlock("Products", products))
+    }
+
+    open fun mapEmission() {}
+    open fun mapInputs() {}
+    open fun mapLandUse() {}
+    open fun mapResources() {}
+
+
+    open fun mapMetas() {
+        val metas = result.meta
+        process.description.let { description ->
+            description.activity.let { activity ->
+                activity.id?.let { metas["id"] = ModelWriter.compactText(it) }
+                activity.name.let { metas["name"] = ModelWriter.compactText(it) }
+                activity.type.let { metas["type"] = it }
+                activity.generalComment?.let {
+                    metas["description"] = ModelWriter.compactAndPad(toStr(it), 12)
+                }
+                activity.energyValues?.let { metas["energyValues"] = it }
+                activity.includedActivitiesStart?.let {
+                    metas["includedActivitiesStart"] = ModelWriter.compactText(it)
+                }
+                activity.includedActivitiesEnd?.let { metas["includedActivitiesEnd"] = ModelWriter.compactText(it) }
+            }
+            description.classifications.forEach { metas[it.system] = ModelWriter.compactText(it.value) }
+            description.geography?.shortName?.let { metas["geography-shortname"] = ModelWriter.compactText(it) }
+            description.geography?.comment?.let { metas["geography-comment"] = ModelWriter.compactText(toStr(it)) }
+        }
+    }
+
+    private fun mapProduct(e: IntermediateExchange, geo: String): ImportedProductExchange {
+        val initComments = ArrayList<String>()
+        e.name?.let { initComments.add(it) }
+        e.classifications.forEach { initComments.add("${it.system} = ${it.value}") }
+        e.uncertainty?.let { uncertaintyToStr(initComments, it) }
+        e.synonyms.forEachIndexed { i, it -> initComments.add("synonym_$i = $it") }
+        val amount = e.amount.toString()
+        val unit = sanitizeSymbol(unitToStr(e.unit))
+
+        val uid = ModelWriter.sanitizeAndCompact("${e.name}_$geo")
+        if (e.outputGroup != 0) {
+            throw ImportException("Invalid outputGroup for product, expected 0, found ${e.outputGroup}")
+        }
+        e.properties.forEach { initComments.add("${it.name} ${it.amount} ${it.unit} isCalculatedAmount=${it.isCalculatedAmount ?: ""} isDefiningValue=${it.isDefiningValue ?: ""}") }
+        return ImportedProductExchange(initComments, amount, unit, uid, 100.0)
+    }
+
+
+    private fun uncertaintyToStr(comments: ArrayList<String>, it: Uncertainty) {
+        it.logNormal?.let { comments.add("// uncertainty: logNormal mean=${it.meanValue}, variance=${it.variance}, mu=${it.mu}") }
+        it.pedigreeMatrix?.let { comments.add("// uncertainty: pedigreeMatrix completeness=${it.completeness}, reliability=${it.reliability}, geoCor=${it.geographicalCorrelation}, tempCor=${it.temporalCorrelation}, techCor=${it.furtherTechnologyCorrelation}, ") }
+        it.normal?.let { comments.add("// uncertainty: normal mean=${it.meanValue}, variance=${it.variance}, varianceWithPedigreeUncertainty=${it.varianceWithPedigreeUncertainty}, ") }
+        it.uniform?.let { comments.add("// uncertainty: uniform minValue=${it.minValue}, maxValue=${it.maxValue}") }
+        it.triangular?.let { comments.add("// uncertainty: triangular minValue=${it.minValue}, maxValue=${it.maxValue}, mostLikelyValue=${it.mostLikelyValue}, ") }
+        it.comment?.let { comments.add("// uncertainty: comment") }
+        it.comment?.let { comments.addAll(ModelWriter.asComment(it)) }
+    }
+
+
+}

src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lci/LciProcessMapper.kt

@@ -0,0 +1,7 @@
+package ch.kleis.lcaplugin.imports.ecospold.lci
+
+import ch.kleis.lcaplugin.imports.ecospold.EcoSpold2ProcessMapper
+import ch.kleis.lcaplugin.imports.ecospold.model.ActivityDataset
+
+class LciProcessMapper  LciaProcessMapper(process: ActivityDataset) : EcoSpold2ProcessMapper(process) {
+}

src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/EcoSpold2SubstanceMapper.kt

@@ -1,6 +1,7 @@
 package ch.kleis.lcaplugin.imports.ecospold.lcia
 
-import ch.kleis.lcaplugin.imports.ecospold.lcia.model.ActivityDataset
+import ch.kleis.lcaplugin.imports.ecospold.EcoSpold2ProcessMapper
+import ch.kleis.lcaplugin.imports.ecospold.model.ActivityDataset
 import ch.kleis.lcaplugin.imports.model.ImportedImpact
 import ch.kleis.lcaplugin.imports.model.ImportedSubstance
 

src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/Ecospold2ProcessRenderer.kt

@@ -2,7 +2,7 @@ package ch.kleis.lcaplugin.imports.ecospold.lcia
 
 import ch.kleis.lcaplugin.imports.ModelWriter
 import ch.kleis.lcaplugin.imports.ecospold.lcia.EcospoldImporter.ProcessDictRecord
-import ch.kleis.lcaplugin.imports.ecospold.lcia.model.ActivityDataset
+import ch.kleis.lcaplugin.imports.ecospold.model.ActivityDataset
 import ch.kleis.lcaplugin.imports.shared.serializer.ProcessSerializer
 import ch.kleis.lcaplugin.imports.shared.serializer.SubstanceSerializer
 import java.io.File
@@ -19,7 +19,7 @@ class Ecospold2ProcessRenderer {
         val category = category(data)
 
         val subFolder = if (category == null) "" else "${category}${File.separatorChar}"
-        val process = EcoSpold2ProcessMapper.map(data)
+        val process = LciaProcessMapper(data).map()
         process.comments.add(processComment)
         val strProcess = ProcessSerializer.serialize(process)
 

src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/EcospoldImporter.kt

@@ -6,8 +6,8 @@ import ch.kleis.lcaplugin.ide.imports.ecospold.EcospoldImportSettings
 import ch.kleis.lcaplugin.imports.Imported
 import ch.kleis.lcaplugin.imports.Importer
 import ch.kleis.lcaplugin.imports.ModelWriter
-import ch.kleis.lcaplugin.imports.ecospold.lcia.model.ActivityDataset
-import ch.kleis.lcaplugin.imports.ecospold.lcia.model.Parser
+import ch.kleis.lcaplugin.imports.ecospold.model.ActivityDataset
+import ch.kleis.lcaplugin.imports.ecospold.model.Parser
 import ch.kleis.lcaplugin.imports.model.ImportedUnit
 import ch.kleis.lcaplugin.imports.shared.serializer.UnitRenderer
 import ch.kleis.lcaplugin.imports.util.AsyncTaskController

src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/LciaProcessMapper.kt

@@ -0,0 +1,14 @@
+package ch.kleis.lcaplugin.imports.ecospold.lcia
+
+import ch.kleis.lcaplugin.imports.ecospold.EcoSpold2ProcessMapper
+import ch.kleis.lcaplugin.imports.ecospold.model.ActivityDataset
+import ch.kleis.lcaplugin.imports.model.ExchangeBlock
+import ch.kleis.lcaplugin.imports.model.ImportedBioExchange
+
+class LciaProcessMapper(process: ActivityDataset) : EcoSpold2ProcessMapper(process) {
+    override fun mapEmission() {
+        val bio = ImportedBioExchange(listOf(), "1.0", "u", pUid, "")
+        result.emissionBlocks = mutableListOf(ExchangeBlock("Virtual Substance for Impact Factors", mutableListOf(bio)))
+    }
+
+}

src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/Activity.kt → src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/model/Activity.kt

@@ -1,4 +1,4 @@
-package ch.kleis.lcaplugin.imports.ecospold.lcia.model
+package ch.kleis.lcaplugin.imports.ecospold.model
 
 class Activity(
     val id: String? = null,

src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/ActivityDataset.kt → src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/model/ActivityDataset.kt

@@ -1,4 +1,4 @@
-package ch.kleis.lcaplugin.imports.ecospold.lcia.model
+package ch.kleis.lcaplugin.imports.ecospold.model
 
 class ActivityDataset private constructor(
     val description: ActivityDescription,

src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/ActivityDescription.kt → src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/model/ActivityDescription.kt

@@ -1,4 +1,4 @@
-package ch.kleis.lcaplugin.imports.ecospold.lcia.model
+package ch.kleis.lcaplugin.imports.ecospold.model
 
 class ActivityDescription private constructor(
     val activity: Activity,

src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/Classification.kt → src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/model/Classification.kt

@@ -1,4 +1,4 @@
-package ch.kleis.lcaplugin.imports.ecospold.lcia.model
+package ch.kleis.lcaplugin.imports.ecospold.model
 
 data class Classification(
     var system: String,

src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/EcospoldRoot.kt → src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/model/EcospoldRoot.kt

@@ -1,4 +1,4 @@
-package ch.kleis.lcaplugin.imports.ecospold.lcia.model
+package ch.kleis.lcaplugin.imports.ecospold.model
 
 class EcospoldRoot(
     val activityDataset: ActivityDataset

src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/FlowData.kt → src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/model/FlowData.kt

@@ -1,4 +1,4 @@
-package ch.kleis.lcaplugin.imports.ecospold.lcia.model
+package ch.kleis.lcaplugin.imports.ecospold.model
 
 
 data class FlowData(

src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/Geography.kt → src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/model/Geography.kt

@@ -1,4 +1,4 @@
-package ch.kleis.lcaplugin.imports.ecospold.lcia.model
+package ch.kleis.lcaplugin.imports.ecospold.model
 
 class Geography(
     val shortName: String? = null,

src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/ImpactIndicator.kt → src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/model/ImpactIndicator.kt

@@ -1,4 +1,4 @@
-package ch.kleis.lcaplugin.imports.ecospold.lcia.model
+package ch.kleis.lcaplugin.imports.ecospold.model
 
 class ImpactIndicator(
     val methodName: String,

src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/IntermediateExchange.kt → src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/model/IntermediateExchange.kt

@@ -1,4 +1,4 @@
-package ch.kleis.lcaplugin.imports.ecospold.lcia.model
+package ch.kleis.lcaplugin.imports.ecospold.model
 
 
 data class Property(

src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/Parser.kt → src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/model/Parser.kt

@@ -1,4 +1,4 @@
-package ch.kleis.lcaplugin.imports.ecospold.lcia.model
+package ch.kleis.lcaplugin.imports.ecospold.model
 
 import org.jdom2.Element
 import org.jdom2.JDOMFactory

src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/Uncertainty.kt → src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/model/Uncertainty.kt

@@ -1,4 +1,4 @@
-package ch.kleis.lcaplugin.imports.ecospold.lcia.model
+package ch.kleis.lcaplugin.imports.ecospold.model
 
 data class Uncertainty(
     val logNormal: LogNormal? = null,

src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/UnitConversion.kt → src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/model/UnitConversion.kt

@@ -1,4 +1,4 @@
-package ch.kleis.lcaplugin.imports.ecospold.lcia.model
+package ch.kleis.lcaplugin.imports.ecospold.model
 
 data class UnitConversion(
     val factor: Double,

src/test/kotlin/ch/kleis/lcaplugin/imports/MetaRendererTest.kt

@@ -1,6 +1,6 @@
 package ch.kleis.lcaplugin.imports
 
-import ch.kleis.lcaplugin.imports.ecospold.lcia.model.Classification
+import ch.kleis.lcaplugin.imports.ecospold.model.Classification
 import io.mockk.unmockkAll
 import org.junit.After
 import org.junit.Test

src/test/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/EcoSpold2Fixture.kt

@@ -1,6 +1,6 @@
 package ch.kleis.lcaplugin.imports.ecospold.lcia
 
-import ch.kleis.lcaplugin.imports.ecospold.lcia.model.*
+import ch.kleis.lcaplugin.imports.ecospold.model.*
 
 class EcoSpold2Fixture {
     companion object {

src/test/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/EcoSpold2ProcessMapperTest.kt

@@ -1,6 +1,7 @@
 package ch.kleis.lcaplugin.imports.ecospold.lcia
 
-import ch.kleis.lcaplugin.imports.ecospold.lcia.model.ActivityDataset
+import ch.kleis.lcaplugin.imports.ecospold.EcoSpold2ProcessMapper
+import ch.kleis.lcaplugin.imports.ecospold.model.ActivityDataset
 import ch.kleis.lcaplugin.imports.util.ImportException
 import com.intellij.testFramework.UsefulTestCase.assertThrows
 import org.junit.Test

src/test/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/Ecospold2ProcessRendererTest.kt

@@ -1,8 +1,9 @@
 package ch.kleis.lcaplugin.imports.ecospold.lcia
 
 import ch.kleis.lcaplugin.imports.ModelWriter
-import ch.kleis.lcaplugin.imports.ecospold.lcia.model.ActivityDataset
-import ch.kleis.lcaplugin.imports.ecospold.lcia.model.Classification
+import ch.kleis.lcaplugin.imports.ecospold.EcoSpold2ProcessMapper
+import ch.kleis.lcaplugin.imports.ecospold.model.ActivityDataset
+import ch.kleis.lcaplugin.imports.ecospold.model.Classification
 import ch.kleis.lcaplugin.imports.model.ImportedProcess
 import ch.kleis.lcaplugin.imports.model.ImportedSubstance
 import ch.kleis.lcaplugin.imports.shared.serializer.ProcessSerializer

src/test/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/ParserTest.kt

@@ -1,5 +1,6 @@
 package ch.kleis.lcaplugin.imports.ecospold.lcia.model
 
+import ch.kleis.lcaplugin.imports.ecospold.model.*
 import org.junit.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertNotNull