fixes for the measurement

1 files changed, 4 insertions, 2 deletions

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BestFirstStrategyForModelGeneration.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BestFirstStrategyForModelGeneration.java
index 45dffe7c..75ce7f10 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BestFirstStrategyForModelGeneration.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BestFirstStrategyForModelGeneration.java
@@ -91,6 +91,7 @@ public class BestFirstStrategyForModelGeneration implements IStrategy {
         private int numberOfPrintedModel = 0;

         private int numberOfSolverCalls = 0;

         

+        public long explorationStarted = 0;

 

         public BestFirstStrategyForModelGeneration(

                         ReasonerWorkspace workspace,

@@ -119,7 +120,7 @@ public class BestFirstStrategyForModelGeneration implements IStrategy {
                 

 //              ViatraQueryEngine engine = context.getQueryEngine();

 //              // TODO: visualisation

-//              matchers = new LinkedList<ViatraQueryMatcher<? extends IPatternMatch>>();

+//              LinkedList<ViatraQueryMatcher<? extends IPatternMatch>> matchers = new LinkedList<ViatraQueryMatcher<? extends IPatternMatch>>();

 //              for(IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>> p : this.method.getAllPatterns()) {

 //                      //System.out.println(p.getSimpleName());

 //                      ViatraQueryMatcher<? extends IPatternMatch> matcher = p.getMatcher(engine);

@@ -137,13 +138,14 @@ public class BestFirstStrategyForModelGeneration implements IStrategy {
                         }

                 };

                 

-                this.numericSolver = new NumericSolver(context, method, false);

+                this.numericSolver = new NumericSolver(context, method, false,this.configuration.runIntermediateNumericalConsistencyChecks);

 

                 trajectoiresToExplore = new PriorityQueue<TrajectoryWithFitness>(11, comparator);

         }

 

         @Override

         public void explore() {

+                this.explorationStarted=System.nanoTime();

                 if (!context.checkGlobalConstraints()) {

                         logger.info("Global contraint is not satisifed in the first state. Terminate.");

                         return;