From c564402ff47c8b5039fccabda7c9b7def7568bd1 Mon Sep 17 00:00:00 2001 From: Philippe Kernevez Date: Fri, 7 Jul 2023 15:05:44 +0200 Subject: [PATCH] En cours --- .../ecospold/EcoSpold2ProcessMapper.kt | 108 ++++++++++++++++++ .../imports/ecospold/lci/LciProcessMapper.kt | 7 ++ .../ecospold/lcia/EcoSpold2ProcessMapper.kt | 103 ----------------- .../ecospold/lcia/EcoSpold2SubstanceMapper.kt | 3 +- .../ecospold/lcia/Ecospold2ProcessRenderer.kt | 4 +- .../imports/ecospold/lcia/EcospoldImporter.kt | 4 +- .../ecospold/lcia/LciaProcessMapper.kt | 14 +++ .../ecospold/{lcia => }/model/Activity.kt | 2 +- .../{lcia => }/model/ActivityDataset.kt | 2 +- .../{lcia => }/model/ActivityDescription.kt | 2 +- .../{lcia => }/model/Classification.kt | 2 +- .../ecospold/{lcia => }/model/EcospoldRoot.kt | 2 +- .../ecospold/{lcia => }/model/FlowData.kt | 2 +- .../ecospold/{lcia => }/model/Geography.kt | 2 +- .../{lcia => }/model/ImpactIndicator.kt | 2 +- .../{lcia => }/model/IntermediateExchange.kt | 2 +- .../ecospold/{lcia => }/model/Parser.kt | 2 +- .../ecospold/{lcia => }/model/Uncertainty.kt | 2 +- .../{lcia => }/model/UnitConversion.kt | 2 +- .../lcaplugin/imports/MetaRendererTest.kt | 2 +- .../imports/ecospold/lcia/EcoSpold2Fixture.kt | 2 +- .../lcia/EcoSpold2ProcessMapperTest.kt | 3 +- .../lcia/Ecospold2ProcessRendererTest.kt | 5 +- .../imports/ecospold/lcia/model/ParserTest.kt | 1 + 24 files changed, 155 insertions(+), 125 deletions(-) create mode 100644 src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/EcoSpold2ProcessMapper.kt create mode 100644 src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lci/LciProcessMapper.kt delete mode 100644 src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/EcoSpold2ProcessMapper.kt create mode 100644 src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/LciaProcessMapper.kt rename src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/{lcia => }/model/Activity.kt (94%) rename src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/{lcia => }/model/ActivityDataset.kt (90%) rename src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/{lcia => }/model/ActivityDescription.kt (90%) rename src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/{lcia => }/model/Classification.kt (55%) rename src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/{lcia => }/model/EcospoldRoot.kt (55%) rename src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/{lcia => }/model/FlowData.kt (70%) rename src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/{lcia => }/model/Geography.kt (60%) rename src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/{lcia => }/model/ImpactIndicator.kt (94%) rename src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/{lcia => }/model/IntermediateExchange.kt (94%) rename src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/{lcia => }/model/Parser.kt (99%) rename src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/{lcia => }/model/Uncertainty.kt (91%) rename src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/{lcia => }/model/UnitConversion.kt (72%) diff --git a/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/EcoSpold2ProcessMapper.kt b/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/EcoSpold2ProcessMapper.kt new file mode 100644 index 000000000..5bb684ccd --- /dev/null +++ b/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): 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() + 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, 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)) } + } + + +} \ No newline at end of file diff --git a/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lci/LciProcessMapper.kt b/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lci/LciProcessMapper.kt new file mode 100644 index 000000000..df915c093 --- /dev/null +++ b/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) { +} \ No newline at end of file diff --git a/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/EcoSpold2ProcessMapper.kt b/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/EcoSpold2ProcessMapper.kt deleted file mode 100644 index 24cfd2dc5..000000000 --- a/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/EcoSpold2ProcessMapper.kt +++ /dev/null @@ -1,103 +0,0 @@ -package ch.kleis.lcaplugin.imports.ecospold.lcia - -import ch.kleis.lcaplugin.imports.ModelWriter -import ch.kleis.lcaplugin.imports.ecospold.lcia.EcospoldImporter.Companion.unitToStr -import ch.kleis.lcaplugin.imports.ecospold.lcia.model.ActivityDataset -import ch.kleis.lcaplugin.imports.ecospold.lcia.model.IntermediateExchange -import ch.kleis.lcaplugin.imports.ecospold.lcia.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 -import ch.kleis.lcaplugin.imports.util.ImportException - -class EcoSpold2ProcessMapper { - companion object { - fun map(process: ActivityDataset): ImportedProcess { - val pUid = uid(process) - val result = ImportedProcess(pUid) - val metas = result.meta - - val geo = if (process.description.geography?.shortName == "GLO") "" - else process.description.geography?.shortName ?: "" - - mapMetas(process, metas) - val products = process.flowData.intermediateExchanges.map { mapProduct(it, geo) }.toMutableList() - result.productBlocks = mutableListOf(ExchangeBlock("Products", products)) - - result.emissionBlocks = mapEmission(pUid) - - return result - } - - private fun mapEmission(pUid: String): MutableList> { - val bio = ImportedBioExchange(listOf(), "1.0", "u", pUid, "") - return mutableListOf(ExchangeBlock("Virtual Substance for Impact Factors", mutableListOf(bio))) - } - - private fun mapProduct(e: IntermediateExchange, geo: String): ImportedProductExchange { - val initComments = ArrayList() - 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, 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)) } - } - - private fun mapMetas(process: ActivityDataset, metas: MutableMap) { - 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 toStr(txts: List): CharSequence { - return txts.joinToString("\n") - } - - - fun uid(data: ActivityDataset): String { - return datasetUid(data.description.activity.name, data.description.geography?.shortName ?: "") - } - - private fun datasetUid(activityName: String, geo: String): String { - return ModelWriter.sanitizeAndCompact(activityName + "_" + geo) - } - - } - -} \ No newline at end of file diff --git a/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/EcoSpold2SubstanceMapper.kt b/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/EcoSpold2SubstanceMapper.kt index cf4494996..c8ad5fcec 100644 --- a/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/EcoSpold2SubstanceMapper.kt +++ b/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 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 index 347a3f62c..2dce79de1 100644 --- a/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/Ecospold2ProcessRenderer.kt +++ b/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) diff --git a/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/EcospoldImporter.kt b/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/EcospoldImporter.kt index 2f9de2c9a..be950ca9d 100644 --- a/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/EcospoldImporter.kt +++ b/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 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 new file mode 100644 index 000000000..987c7f23a --- /dev/null +++ b/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))) + } + +} \ No newline at end of file diff --git a/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/Activity.kt b/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/model/Activity.kt similarity index 94% rename from src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/Activity.kt rename to src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/model/Activity.kt index e31ee3738..61e147030 100644 --- a/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/Activity.kt +++ b/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, diff --git a/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/ActivityDataset.kt b/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/model/ActivityDataset.kt similarity index 90% rename from src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/ActivityDataset.kt rename to src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/model/ActivityDataset.kt index 7d523721c..15dc6e8e7 100644 --- a/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/ActivityDataset.kt +++ b/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, diff --git a/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/ActivityDescription.kt b/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/model/ActivityDescription.kt similarity index 90% rename from src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/ActivityDescription.kt rename to src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/model/ActivityDescription.kt index 951b36743..d310c7775 100644 --- a/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/ActivityDescription.kt +++ b/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, diff --git a/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/Classification.kt b/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/model/Classification.kt similarity index 55% rename from src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/Classification.kt rename to src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/model/Classification.kt index df6bb986d..c439239c6 100644 --- a/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/Classification.kt +++ b/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, diff --git a/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/EcospoldRoot.kt b/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/model/EcospoldRoot.kt similarity index 55% rename from src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/EcospoldRoot.kt rename to src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/model/EcospoldRoot.kt index d99b6ce54..0573738bf 100644 --- a/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/EcospoldRoot.kt +++ b/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 diff --git a/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/FlowData.kt b/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/model/FlowData.kt similarity index 70% rename from src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/FlowData.kt rename to src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/model/FlowData.kt index 1ef48a6fc..a6b5fcc01 100644 --- a/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/FlowData.kt +++ b/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( diff --git a/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/Geography.kt b/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/model/Geography.kt similarity index 60% rename from src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/Geography.kt rename to src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/model/Geography.kt index 7ab29b786..1344c9d15 100644 --- a/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/Geography.kt +++ b/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, diff --git a/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/ImpactIndicator.kt b/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/model/ImpactIndicator.kt similarity index 94% rename from src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/ImpactIndicator.kt rename to src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/model/ImpactIndicator.kt index ac502c665..83bdec70b 100644 --- a/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/ImpactIndicator.kt +++ b/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, diff --git a/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/IntermediateExchange.kt b/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/model/IntermediateExchange.kt similarity index 94% rename from src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/IntermediateExchange.kt rename to src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/model/IntermediateExchange.kt index 252aa5375..a8285097c 100644 --- a/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/IntermediateExchange.kt +++ b/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( diff --git a/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/Parser.kt b/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/model/Parser.kt similarity index 99% rename from src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/Parser.kt rename to src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/model/Parser.kt index d1be34f2d..c17791843 100644 --- a/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/Parser.kt +++ b/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 diff --git a/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/Uncertainty.kt b/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/model/Uncertainty.kt similarity index 91% rename from src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/Uncertainty.kt rename to src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/model/Uncertainty.kt index 0206b73c7..146e2becf 100644 --- a/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/Uncertainty.kt +++ b/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, diff --git a/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/UnitConversion.kt b/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/model/UnitConversion.kt similarity index 72% rename from src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/UnitConversion.kt rename to src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/model/UnitConversion.kt index d3d7c1cea..83bbdd001 100644 --- a/src/main/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/UnitConversion.kt +++ b/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, diff --git a/src/test/kotlin/ch/kleis/lcaplugin/imports/MetaRendererTest.kt b/src/test/kotlin/ch/kleis/lcaplugin/imports/MetaRendererTest.kt index 65117169c..8a2bec3e3 100644 --- a/src/test/kotlin/ch/kleis/lcaplugin/imports/MetaRendererTest.kt +++ b/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 diff --git a/src/test/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/EcoSpold2Fixture.kt b/src/test/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/EcoSpold2Fixture.kt index 42dbde773..d5aebd956 100644 --- a/src/test/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/EcoSpold2Fixture.kt +++ b/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 { diff --git a/src/test/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/EcoSpold2ProcessMapperTest.kt b/src/test/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/EcoSpold2ProcessMapperTest.kt index f2f91894a..00ef26d9e 100644 --- a/src/test/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/EcoSpold2ProcessMapperTest.kt +++ b/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 diff --git a/src/test/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/Ecospold2ProcessRendererTest.kt b/src/test/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/Ecospold2ProcessRendererTest.kt index e59d0750c..a63896da6 100644 --- a/src/test/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/Ecospold2ProcessRendererTest.kt +++ b/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 diff --git a/src/test/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/ParserTest.kt b/src/test/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/ParserTest.kt index ed634c460..bd6a3aa28 100644 --- a/src/test/kotlin/ch/kleis/lcaplugin/imports/ecospold/lcia/model/ParserTest.kt +++ b/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