2 files changed, 10 insertions, 2 deletions
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/Constraint2Logic.xtend b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/Constraint2Logic.xtend
index ffbca0af..b8c52af4 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/Constraint2Logic.xtend
+++ b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/Constraint2Logic.xtend
@@ -335,7 +335,11 @@ class Constraint2Logic {
        {
                val outputVariable = constraint.outputVariable
                val expression = expressionExtractor.extractExpression(constraint.evaluator)
-                return expressionEvaliation2Logic.transformEval(outputVariable,expression,variable2Variable)            
+                if(outputVariable === null) {
+                        return expressionEvaliation2Logic.transformCheck(expression,variable2Variable)
+                } else {
+                        return expressionEvaliation2Logic.transformEval(outputVariable,expression,variable2Variable)
+                }       
        }
        
        def dispatch Term transformConstraint(PConstraint constraint,
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/Viatra2Logic.xtend b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/Viatra2Logic.xtend
index 0f97d3fe..a098945d 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/Viatra2Logic.xtend
+++ b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/Viatra2Logic.xtend
@@ -248,6 +248,10 @@ class  Viatra2Logic {
                                                innerPositiveVariables += logicVariable
                                        }
                                        variable2Variable.put(innerVariable,logicVariable)
+                                        body.pattern.lookup(viatra2LogicTrace.query2Annotation).variableTrace += createVariableMapping=>[
+                                                it.sourcePVariable = innerVariable
+                                                it.targetLogicVariable = logicVariable
+                                        ]
                                }
                        }
                }
@@ -267,7 +271,7 @@ class  Viatra2Logic {
                } else {
                        Exists(innerPositiveVariables,allNegativeVariablesAreSatisfied);
                }
-                
+        
                return allVariablesAreExisting
        }