2 files changed, 26 insertions, 12 deletions

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PConstraintTransformer.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PConstraintTransformer.xtend
index 608ab994..5ca78e97 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PConstraintTransformer.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PConstraintTransformer.xtend
@@ -143,7 +143,13 @@ class PConstraintTransformer {
                 return referPattern(pcall.referredQuery,params,modality,true,true)

         }

         dispatch def transformConstraint(ExportedParameter e, Modality modality, List<VariableMapping> variableMapping) {

-                return '''// «e.parameterName» is exported'''

+                val v1 = '''var_«e.parameterName»'''

+                val v2 = e.parameterVariable.canonizeName

+                if(v1.compareTo(v2) == 0) {

+                        return '''// «v1» exported'''

+                } else {

+                        return '''«v1» == «v2»;'''

+                }

         }

         dispatch def transformConstraint(ConstantValue c, Modality modality, List<VariableMapping> variableMapping) {

                 val target = c.supplierKey

@@ -189,24 +195,29 @@ class PConstraintTransformer {
         def hasValue(PVariable v, String target, Modality m, List<VariableMapping> variableMapping) {

                 val typeReference = variableMapping.filter[it.sourcePVariable === v].head.targetLogicVariable.range as PrimitiveTypeReference

                 if(m.isMay) {

-                        '''PrimitiveElement.valueSet(«v.canonizeName»,«v.valueSetted»); «hasValueExpression(typeReference,v,v.valueVariable)» check(!«v.valueSetted»||«v.valueVariable»==«target»));'''

+                        '''PrimitiveElement.valueSet(«v.canonizeName»,«v.valueSetted»); «hasValueExpressionByRef(typeReference,v,v.valueVariable)» check(!«v.valueSetted»||«v.valueVariable»==«target»));'''

                 } else { // Must or current

-                        '''PrimitiveElement.valueSet(«v.canonizeName»,true);«hasValueExpression(typeReference,v,target)»'''

+                        '''PrimitiveElement.valueSet(«v.canonizeName»,true);«hasValueExpressionByRef(typeReference,v,target)»'''

                 }

         }

         

         private def hasValueExpression(List<VariableMapping> variableMapping, PVariable v, String target) {

-                hasValueExpression(

-                        variableMapping.filter[it.sourcePVariable === v].head.targetLogicVariable.range,

+                val mapping = variableMapping.filter[

+                        val v2 = (it.sourcePVariable as PVariable)

+                        v2 === v

+                ].head

+                val range = mapping.targetLogicVariable.range

+                hasValueExpressionByRef(

+                        range,

                         v,

                         target

                 )

         }

-        private def dispatch hasValueExpression(BoolTypeReference typeReference, PVariable v, String target)    '''BooleanElement.value(«v.canonizeName»,«target»);'''

-        private def dispatch hasValueExpression(IntTypeReference typeReference, PVariable v, String target)             '''IntegerElement.value(«v.canonizeName»,«target»);'''

-        private def dispatch hasValueExpression(RealTypeReference typeReference, PVariable v, String target)    '''RealElement.value(«v.canonizeName»,«target»);'''

-        private def dispatch hasValueExpression(StringTypeReference typeReference, PVariable v, String target)  '''StringElement.value(«v.canonizeName»,«target»);'''

-        private def dispatch hasValueExpression(TypeReference typeReference, PVariable v, String target) {

+        private def dispatch hasValueExpressionByRef(BoolTypeReference typeReference, PVariable v, String target)       '''BooleanElement.value(«v.canonizeName»,«target»);'''

+        private def dispatch hasValueExpressionByRef(IntTypeReference typeReference, PVariable v, String target)                '''IntegerElement.value(«v.canonizeName»,«target»);'''

+        private def dispatch hasValueExpressionByRef(RealTypeReference typeReference, PVariable v, String target)       '''RealElement.value(«v.canonizeName»,«target»);'''

+        private def dispatch hasValueExpressionByRef(StringTypeReference typeReference, PVariable v, String target)     '''StringElement.value(«v.canonizeName»,«target»);'''

+        private def dispatch hasValueExpressionByRef(TypeReference typeReference, PVariable v, String target) {

                 throw new UnsupportedOperationException('''Unsupported primitive type reference: «typeReference.class»''')

         }

         

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 bd6e3e6e..37950834 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
@@ -10,6 +10,7 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.Binary
 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.queries.PDisjunction

 

 class RelationDefinitionIndexer {

         public val PatternGenerator base;

@@ -23,7 +24,8 @@ class RelationDefinitionIndexer {
         def generateRelationDefinitions(

                 LogicProblem problem,

                 Iterable<RelationDefinition> relations,

-                Map<String,PQuery> fqn2PQuery) {

+                Map<String,PQuery> fqn2PQuery)

+        {

                 val relation2PQuery = relations.toInvertedMap[

                         annotations.filter(TransfomedViatraQuery).head.patternFullyQualifiedName.lookup(fqn2PQuery)

                 ]

@@ -67,11 +69,12 @@ class RelationDefinitionIndexer {
         

         private def transformPattern(RelationDefinition relation, PQuery p, Modality modality) {

                 try {

+                val bodies = (relation.annotations.filter(TransfomedViatraQuery).head.optimizedDisjunction as PDisjunction).bodies

                 return '''

                         private pattern «relationDefinitionName(relation,modality)»(

                                 problem:LogicProblem, interpretation:PartialInterpretation,

                                 «FOR param : p.parameters SEPARATOR ', '»var_«param.name»«ENDFOR»)

-                        «FOR body : p.disjunctBodies.bodies SEPARATOR "or"»{

+                        «FOR body : bodies SEPARATOR "or"»{

                                 find interpretation(problem,interpretation);

                                 «FOR constraint : body.constraints»

                                         «this.constraintTransformer.transformConstraint(constraint,modality,relation.annotations.filter(TransfomedViatraQuery).head.variableTrace)»