1 files changed, 6 insertions, 1 deletions
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..74e03f71 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
@@ -144,6 +144,7 @@ class  Viatra2Logic {
                        it.target = lRelation
                        it.patternFullyQualifiedName = pquery.fullyQualifiedName
                        it.patternPQuery = pquery
+                        it.optimizedDisjunction = viatra2LogicTrace.query2Disjunction.get(pquery)
                ]
                viatra2LogicTrace.query2Annotation.put(pquery,annotation)
                ecore2LogicTrace.output.annotations += annotation
@@ -248,6 +249,10 @@ class  Viatra2Logic {
                                                innerPositiveVariables += logicVariable
                                        }
                                        variable2Variable.put(innerVariable,logicVariable)
+                                        body.pattern.lookup(viatra2LogicTrace.query2Annotation).variableTrace += createVariableMapping=>[
+                                                it.sourcePVariable = innerVariable
+                                                it.targetLogicVariable = logicVariable
+                                        ]
                                }
                        }
                }
@@ -267,7 +272,7 @@ class  Viatra2Logic {
                } else {
                        Exists(innerPositiveVariables,allNegativeVariablesAreSatisfied);
                }
-                
+        
                return allVariablesAreExisting
        }