derived feature -> partial relation bugfix

3 files changed, 8 insertions, 7 deletions

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 1aedaf7b..00239935 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
@@ -98,7 +98,8 @@ class Logic2Ecore {
                 if(rootCandidates.size == 1) {

                         return rootCandidates.head

                 } else {

-                        throw new AssertionError("Multiple root objects")

+                        println('''No single root objects: «rootCandidates.size»''')

+                        return rootCandidates.head

                 }

         }

 }
\ No newline at end of file
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/rules/RefinementRuleProvider.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/rules/RefinementRuleProvider.xtend
index e9af0638..1e7b3c4c 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/rules/RefinementRuleProvider.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/rules/RefinementRuleProvider.xtend
@@ -130,8 +130,6 @@ class RefinementRuleProvider {
                         }

                 } else {

                         ruleBuilder.action[match |

-                                println(name)

-                                

                                 val startTime = System.nanoTime

                                 //val problem = match.get(0) as LogicProblem

                                 val interpretation = match.get(1) as PartialInterpretation

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend
index 761e77b1..9a737ab9 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend
@@ -75,7 +75,9 @@ class InstanceModel2PartialInterpretation {
                 val attributesUsed = ecore2Logic.allAttributesInScope(ecore2LogicTrace).toSet

                 for(source : objects) {

                         // Translating the references

-                        for(reference : source.eClass.EAllReferences.filter[referencesUsed.contains(it)]) {

+                        for(reference : source.eClass.EAllReferences.filter[

+                                referencesUsed.contains(it) && !it.derived]) 

+                        {

                                 val type = ecore2Logic.relationOfReference(ecore2LogicTrace,reference)

                                 val interpretation = type.lookup(partialInterpretationTrace.relation2Interpretation)

                                 val sourceElement = source.lookup(object2DefinedElement)

@@ -97,7 +99,7 @@ class InstanceModel2PartialInterpretation {
                         }

                         

                         // Transforming the attributes

-                        for(attribute : source.eClass.EAllAttributes.filter[attributesUsed.contains(it)]) {

+                        for(attribute : source.eClass.EAllAttributes.filter[attributesUsed.contains(it) && !it.derived]) {

                                 val type = ecore2Logic.relationOfAttribute(ecore2LogicTrace,attribute)

                                 val interpretation = type.lookup(partialInterpretationTrace.relation2Interpretation)

                                 val sourceElement = source.lookup(object2DefinedElement)

@@ -105,7 +107,7 @@ class InstanceModel2PartialInterpretation {
                                         val listOfTargets = source.eGet(attribute) as List<? extends EObject>

                                         for(target : listOfTargets) {

                                                 val value = translateValue(target,ecore2LogicTrace,partialInterpretationTrace)

-                                                if(value != null) {

+                                                if(value !== null) {

                                                         translateLink(interpretation,sourceElement,value)

                                                 }

                                         }

@@ -113,7 +115,7 @@ class InstanceModel2PartialInterpretation {
                                         val target = source.eGet(attribute)

                                         if(target !== null) {

                                                 val value = translateValue(target,ecore2LogicTrace,partialInterpretationTrace)

-                                                if(value != null) {

+                                                if(value !== null) {

                                                         translateLink(interpretation,sourceElement,value)

                                                 }

                                         }