1 files changed, 10 insertions, 5 deletions

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/RelationDefinitionIndexer.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/RelationDefinitionIndexer.xtend
index 9723373f..0ae28b66 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/RelationDefinitionIndexer.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/RelationDefinitionIndexer.xtend
@@ -5,6 +5,7 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem
 import hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.TransfomedViatraQuery

 import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.Modality

 import java.util.Map

+import org.eclipse.emf.common.util.Enumerator

 import org.eclipse.emf.ecore.EAttribute

 import org.eclipse.emf.ecore.EEnumLiteral

 import org.eclipse.emf.ecore.EReference

@@ -17,6 +18,7 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality
 import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter

 import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Inequality

 import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.NegativePatternCall

+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.TypeFilterConstraint

 import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.BinaryTransitiveClosure

 import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.ConstantValue

 import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall

@@ -24,7 +26,6 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeCo
 import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery

 

 import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.*

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.TypeFilterConstraint

 

 class RelationDefinitionIndexer {

         val PatternGenerator base;

@@ -33,7 +34,7 @@ class RelationDefinitionIndexer {
                 this.base = base

         }

         

-        public def generateRelationDefinitions(

+        def generateRelationDefinitions(

                 LogicProblem problem,

                 Iterable<RelationDefinition> relations,

                 Map<String,PQuery> fqn2PQuery) {

@@ -71,7 +72,7 @@ class RelationDefinitionIndexer {
                 ]

         }

         

-        private def relationDefinitionName(RelationDefinition relation, Modality modality)

+        def String relationDefinitionName(RelationDefinition relation, Modality modality)

                 '''«modality.name.toLowerCase»InRelation_«base.canonizeName(relation.name)»'''

         

         private def canonizeName(PVariable v) {

@@ -109,7 +110,7 @@ class RelationDefinitionIndexer {
                 else return Modality::MUST

         } 

         

-        def public referPattern(PQuery p, String[] variables, Modality modality, boolean positive, boolean transitive) '''

+        def referPattern(PQuery p, String[] variables, Modality modality, boolean positive, boolean transitive) '''

                 «IF !positive»neg «ENDIF»find «IF transitive»twoParam_«ENDIF»«modality.name.toLowerCase»InRelation_pattern_«p.fullyQualifiedName.replace('.','_')»«IF transitive»+«ENDIF»(«IF !transitive»problem,interpretation,«ENDIF»«variables.join(',')»);

         '''

         

@@ -227,7 +228,11 @@ class RelationDefinitionIndexer {
                 var String additionalDefinition;

                 if(target instanceof EEnumLiteral) {

                         targetString = '''const_«target.name»_«target.EEnum.name»'''

-                        additionalDefinition = '''DefinedElement.name(«targetString»,"«target.name» «target.EEnum.name»");  //LogicProblem.elements(problem,«targetString»);'''

+                        additionalDefinition = '''DefinedElement.name(«targetString»,"«target.name» literal «target.EEnum.name»");  //LogicProblem.elements(problem,«targetString»);'''

+                } else if(target instanceof Enumerator) {

+                        // XXX We should get the corresponding EEnum name instead of the java class name.

+                        targetString = '''const_«target.name»_«target.class.simpleName»'''

+                        additionalDefinition = '''DefinedElement.name(«targetString»,"«target.name» literal «target.class.simpleName»");  //LogicProblem.elements(problem,«targetString»);'''

                 } else if(target instanceof Integer) {

                         targetString = '''const_«target»_Integer'''

                         additionalDefinition = '''IntegerElement.value(«targetString»,«target»);'''