2 files changed, 9 insertions, 11 deletions

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 f7fe97a3..699b095d 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
@@ -372,19 +372,17 @@ class RefinementRuleProvider {
                                 val src = match.get(3) as DefinedElement

                                 val trg = match.get(4) as DefinedElement

 

-                                queryEngine.delayUpdatePropagation [

-                                        val startTime = System.nanoTime

-                                        createRelationLinkAction(src, trg, relationInterpretation)

-                                        statistics.addExecutionTime(System.nanoTime - startTime)

-                                ]

+                                val startTime = System.nanoTime

+                                createRelationLinkAction(src, trg, relationInterpretation)

+                                statistics.addExecutionTime(System.nanoTime - startTime)

 

                                 // Scope propagation

                                 if (scopePropagator.isPropagationNeededAfterAdditionToRelation(declaration)) {

-                                        queryEngine.delayUpdatePropagation [

-                                                val propagatorStartTime = System.nanoTime

-                                                scopePropagator.propagateAllScopeConstraints()

-                                                statistics.addScopePropagationTime(System.nanoTime - propagatorStartTime)

-                                        ]

+                                        flushQueryEngine(scopePropagator)

+

+                                        val propagatorStartTime = System.nanoTime

+                                        scopePropagator.propagateAllScopeConstraints()

+                                        statistics.addScopePropagationTime(System.nanoTime - propagatorStartTime)

                                 }

                         ]

                 } else {

diff --git a/Solvers/VIATRA-Solver/org.eclipse.viatra.dse/src/org/eclipse/viatra/dse/base/DesignSpaceManager.java b/Solvers/VIATRA-Solver/org.eclipse.viatra.dse/src/org/eclipse/viatra/dse/base/DesignSpaceManager.java
index 7e7a6e51..133ef948 100644
--- a/Solvers/VIATRA-Solver/org.eclipse.viatra.dse/src/org/eclipse/viatra/dse/base/DesignSpaceManager.java
+++ b/Solvers/VIATRA-Solver/org.eclipse.viatra.dse/src/org/eclipse/viatra/dse/base/DesignSpaceManager.java
@@ -369,6 +369,7 @@ public class DesignSpaceManager implements IBacktrackListener {
                 } catch (InvocationTargetException e) {
                         throw new RuntimeException(e);
                 }
+                backtrackingTime += System.nanoTime() - start;
                 updateActivationCodes();
 
                 Object lastActivationId = trajectory.getLastActivationId();
@@ -382,7 +383,6 @@ public class DesignSpaceManager implements IBacktrackListener {
                 }
 
                 logger.debug("Backtrack.");
-                backtrackingTime += System.nanoTime() - start;
 
                 return true;
         }