full Ecore -> Logic -> Ecore support

3 files changed, 35 insertions, 17 deletions

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/EReferenceMapper.xtend b/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/EReferenceMapper.xtend
index e5de6584..81c0858d 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/EReferenceMapper.xtend
+++ b/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/src/hu/bme/mit/inf/dslreasoner/ecore2logic/EReferenceMapper.xtend
@@ -14,6 +14,7 @@ import org.eclipse.emf.ecore.EReference
 

 interface EReferenceMapper{

         def void transformEReferences(Ecore2Logic_Trace trace, LogicProblem problem, Iterable<EReference> classes);

+        def Iterable<EReference> allReferencesInScope(Ecore2Logic_Trace trace) 

         def Term IsInReference(Ecore2Logic_Trace trace, TermDescription source, TermDescription target, EReference type)

         def RelationDeclaration relationOfReference(Ecore2Logic_Trace trace, EReference reference)

 }

@@ -151,4 +152,9 @@ class EReferenceMapper_RelationsOverTypes implements EReferenceMapper{
         override relationOfReference(Ecore2Logic_Trace trace, EReference reference) {

                 trace.referenceMapperTrace.asTrace.indicators.get(reference)

         }

+        

+        override allReferencesInScope(Ecore2Logic_Trace trace) {

+                trace.referenceMapperTrace.asTrace.indicators.keySet

+        }

+        

 }
\ No newline at end of file
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic2ecore/META-INF/MANIFEST.MF b/Framework/hu.bme.mit.inf.dslreasoner.logic2ecore/META-INF/MANIFEST.MF
index 7a572aa9..5f89c3d0 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic2ecore/META-INF/MANIFEST.MF
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic2ecore/META-INF/MANIFEST.MF
@@ -10,4 +10,5 @@ Require-Bundle: com.google.guava,
  org.eclipse.xtend.lib.macro,

  hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0",

  org.eclipse.ocl.ecore;bundle-version="3.6.0"

+Export-Package: 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 2ab7091e..65328a3a 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
@@ -14,6 +14,7 @@ import java.util.Set
 import org.eclipse.emf.ecore.EObject

 import java.util.List

 import java.util.Collection

+import org.eclipse.emf.ecore.EStructuralFeature

 

 class Logic2Ecore {

         private val extension LogicProblemBuilder problemBuilder = new LogicProblemBuilder

@@ -29,7 +30,6 @@ class Logic2Ecore {
                 val elements = new HashSet

                 val element2Classes = new HashMap

                 

-                

                 for(clazz: allClasses) {

                         val type = ecore2Logic.TypeofEClass(forwardTrace,clazz);

                         val elementsOfClass = getElements(interpretation,type)

@@ -48,20 +48,22 @@ class Logic2Ecore {
                 

                 val allReferences = ecore2Logic.allReferencesInScope(forwardTrace)

                 for(referenceType : allReferences) {

-                        for(sourceElement : elements) {

-                                val sourceObject = sourceElement.lookup(element2Object)

-                                if(sourceObject.eClass.isSuperTypeOf(referenceType.EContainingClass)) {

-                                        for(targetElement: elements) {

-                                                val targetObject = targetElement.lookup(element2Object)

-                                                if(targetObject.eClass.isSuperTypeOf(referenceType.EReferenceType)) {

-                                                        val expression = ecore2Logic.IsInReference(forwardTrace,sourceElement,targetElement,referenceType)

-                                                        val linkExist = interpretation.evalAsBool(expression)

-                                                        if(linkExist) {

-                                                                if(referenceType.isMany) {

-                                                                        val list = sourceObject.eGet(referenceType) as List<? super EObject>

-                                                                        list+= targetObject

-                                                                } else {

-                                                                        sourceObject.eSet(referenceType,targetObject)

+                        if(referenceType.canSetFeature) {

+                                for(sourceElement : elements) {

+                                        val sourceObject = sourceElement.lookup(element2Object)

+                                        if(referenceType.EContainingClass.isSuperTypeOf(sourceObject.eClass)) {

+                                                for(targetElement: elements) {

+                                                        val targetObject = targetElement.lookup(element2Object)

+                                                        if(referenceType.EReferenceType.isSuperTypeOf(targetObject.eClass)) {

+                                                                val expression = ecore2Logic.IsInReference(forwardTrace,sourceElement,targetElement,referenceType)

+                                                                val linkExist = interpretation.evalAsBool(expression)

+                                                                if(linkExist) {

+                                                                        if(referenceType.isMany) {

+                                                                                val list = sourceObject.eGet(referenceType) as List<? super EObject>

+                                                                                list+= targetObject

+                                                                        } else {

+                                                                                sourceObject.eSet(referenceType,targetObject)

+                                                                        }

                                                                 }

                                                         }

                                                 }

@@ -70,11 +72,15 @@ class Logic2Ecore {
                         }

                 }

                 

-                /// Attributes

+                /// + Attributes

                 

                 return element2Object.values.root

         }

         

+        private def canSetFeature(EStructuralFeature feature) {

+                feature.changeable && !feature.derived

+        }

+        

         def  mostConcreteType(Set<EClass> classes) {

                 for(candidate : classes) {

                         val subtypeOfAll = classes.forall[it.isSuperTypeOf(candidate)]

@@ -86,6 +92,11 @@ class Logic2Ecore {
         }

         

         def getRoot(Collection<EObject> objects) {

-                objects.filter[eContainer === null].head

+                val rootCandidates = objects.filter[eContainer === null]

+                if(rootCandidates.size == 1) {

+                        return rootCandidates.head

+                } else {

+                        throw new AssertionError("Multiple root objects")

+                }

         }

 }
\ No newline at end of file