From eb081453e93e6e30c0b6bb92400275529ed3273b Mon Sep 17 00:00:00 2001
From: Kristóf Marussy <marussy@mit.bme.hu>
Date: Wed, 20 May 2020 02:07:37 +0200
Subject: Fix attribute export to xmi

---
 .../inf/dslreasoner/logic2ecore/Logic2Ecore.xtend  | 49 ++++++++--------------
 1 file changed, 17 insertions(+), 32 deletions(-)

(limited to 'Framework/hu.bme.mit.inf.dslreasoner.logic2ecore')

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic2ecore/src/hu/bme/mit/inf/dslreasoner/logic2ecore/Logic2Ecore.xtend b/Framework/hu.bme.mit.inf.dslreasoner.logic2ecore/src/hu/bme/mit/inf/dslreasoner/logic2ecore/Logic2Ecore.xtend
index 08c6b7b7..8d6b565a 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic2ecore/src/hu/bme/mit/inf/dslreasoner/logic2ecore/Logic2Ecore.xtend
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic2ecore/src/hu/bme/mit/inf/dslreasoner/logic2ecore/Logic2Ecore.xtend
@@ -3,25 +3,24 @@ package hu.bme.mit.inf.dslreasoner.logic2ecore
 import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic
 import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace
 import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicModelInterpretation
+import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicProblemBuilder
 import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicStructureBuilder
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TermDescription
+import java.math.BigDecimal
 import java.util.Collection
 import java.util.HashMap
 import java.util.HashSet
 import java.util.List
+import java.util.Map
 import java.util.Set
 import org.eclipse.emf.ecore.EClass
+import org.eclipse.emf.ecore.EDataType
+import org.eclipse.emf.ecore.EEnum
 import org.eclipse.emf.ecore.EObject
 import org.eclipse.emf.ecore.EStructuralFeature
+import org.eclipse.emf.ecore.EcorePackage
 
 import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.*
-import org.eclipse.emf.ecore.EEnum
-import org.eclipse.emf.ecore.EDataType
-import org.eclipse.emf.ecore.EcorePackage
-import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TermDescription
-import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicProblemBuilder
-import java.util.Map
-import org.eclipse.emf.ecore.EAttribute
-import java.math.BigDecimal
 
 class Logic2Ecore {
 	val extension LogicStructureBuilder structureBuilder = new LogicStructureBuilder
@@ -86,15 +85,15 @@ class Logic2Ecore {
 					if(attributeType.EContainingClass.isSuperTypeOf(sourceObject.eClass)) {
 						val allElementsOfTargetDatatype = getAllElementsOfDatatype(attributeType.EAttributeType,forwardTrace,interpretation)
 						for(l : allElementsOfTargetDatatype.entrySet) {
-							val expression = ecore2Logic.IsAttributeValue(forwardTrace,sourceElement,l.value,attributeType)
+							val expression = ecore2Logic.IsAttributeValue(forwardTrace,sourceElement,l.key,attributeType)
 							val linkExist = interpretation.evalAsBool(expression)
 							if(linkExist) {
 								if(attributeType.isMany) {
 									val list = sourceObject.eGet(attributeType) as List<? super Object>
-									list += l.key
+									list += l.value
 								} else {
 									try {
-										sourceObject.eSet(attributeType,translateType(attributeType.EAttributeType,l.key))
+										sourceObject.eSet(attributeType,translateType(attributeType.EAttributeType,l.value))
 									} catch(Exception e) {
 										e.printStackTrace
 									}
@@ -119,34 +118,20 @@ class Logic2Ecore {
 		} else return value
 	}
 	
-	
-//							if(attributeType.EAttributeType.isSuperTypeOf(targetObject.eClass)) {
-//								val expression = ecore2Logic.IsAttributeValue(forwardTrace,sourceElement,targetElement,attributeType)
-//								val linkExist = interpretation.evalAsBool(expression)
-//								if(linkExist) {
-//									if(attributeType.isMany) {
-//											val list = sourceObject.eGet(attributeType) as List<? super EObject>
-//											list+= targetObject
-//										} else {
-//											sourceObject.eSet(referenceType,targetObject)
-//										}
-//								}
-//							}
-	
-	protected dispatch def Map<? extends Object, ? extends TermDescription> getAllElementsOfDatatype(EEnum type, Ecore2Logic_Trace forwardTrace, LogicModelInterpretation interpretation) {
-		ecore2Logic.allLiteralsInScope(forwardTrace).toInvertedMap[ecore2Logic.Literal(forwardTrace,it)]
+	protected dispatch def Map<? extends TermDescription, ? extends Object> getAllElementsOfDatatype(EEnum type, Ecore2Logic_Trace forwardTrace, LogicModelInterpretation interpretation) {
+		ecore2Logic.allLiteralsInScope(forwardTrace).toMap[ecore2Logic.Literal(forwardTrace,it)]
 	}
 	
-	protected dispatch def Map<? extends Object, ? extends TermDescription> getAllElementsOfDatatype(EDataType primitive, Ecore2Logic_Trace forwardTrace, LogicModelInterpretation interpretation) {
+	protected dispatch def Map<? extends TermDescription, ? extends Object> getAllElementsOfDatatype(EDataType primitive, Ecore2Logic_Trace forwardTrace, LogicModelInterpretation interpretation) {
 		val extension LogicProblemBuilder b = new LogicProblemBuilder
 		if(primitive === EcorePackage.eINSTANCE.EInt || primitive === EcorePackage.eINSTANCE.EShort || primitive === EcorePackage.eINSTANCE.ELong) {
-			interpretation.allIntegersInStructure.toInvertedMap[it.asTerm]
+			interpretation.allIntegersWithInterpretation
 		} else if(primitive === EcorePackage.eINSTANCE.EDouble || primitive === EcorePackage.eINSTANCE.EFloat) {
-			interpretation.allRealsInStructure.toInvertedMap[it.asTerm]
+			interpretation.allRealsWithInterpretation
 		} else if(primitive === EcorePackage.eINSTANCE.EString) {
-			interpretation.allStringsInStructure.toInvertedMap[it.asTerm]
+			interpretation.allStringsWithInterpretation
 		} else if(primitive === EcorePackage.eINSTANCE.EBoolean) {
-			return #[false,true].toInvertedMap[it.asTerm]
+			interpretation.allBooleansWithInterpretation
 		}
 	}
 	
-- 
cgit v1.2.3-54-g00ecf