diff options
Diffstat (limited to 'Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BestFirstStrategyForModelGeneration.java')
-rw-r--r-- | Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BestFirstStrategyForModelGeneration.java | 6 |
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 { | |||
91 | private int numberOfPrintedModel = 0; | 91 | private int numberOfPrintedModel = 0; |
92 | private int numberOfSolverCalls = 0; | 92 | private int numberOfSolverCalls = 0; |
93 | 93 | ||
94 | public long explorationStarted = 0; | ||
94 | 95 | ||
95 | public BestFirstStrategyForModelGeneration( | 96 | public BestFirstStrategyForModelGeneration( |
96 | ReasonerWorkspace workspace, | 97 | ReasonerWorkspace workspace, |
@@ -119,7 +120,7 @@ public class BestFirstStrategyForModelGeneration implements IStrategy { | |||
119 | 120 | ||
120 | // ViatraQueryEngine engine = context.getQueryEngine(); | 121 | // ViatraQueryEngine engine = context.getQueryEngine(); |
121 | // // TODO: visualisation | 122 | // // TODO: visualisation |
122 | // matchers = new LinkedList<ViatraQueryMatcher<? extends IPatternMatch>>(); | 123 | // LinkedList<ViatraQueryMatcher<? extends IPatternMatch>> matchers = new LinkedList<ViatraQueryMatcher<? extends IPatternMatch>>(); |
123 | // for(IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>> p : this.method.getAllPatterns()) { | 124 | // for(IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>> p : this.method.getAllPatterns()) { |
124 | // //System.out.println(p.getSimpleName()); | 125 | // //System.out.println(p.getSimpleName()); |
125 | // ViatraQueryMatcher<? extends IPatternMatch> matcher = p.getMatcher(engine); | 126 | // ViatraQueryMatcher<? extends IPatternMatch> matcher = p.getMatcher(engine); |
@@ -137,13 +138,14 @@ public class BestFirstStrategyForModelGeneration implements IStrategy { | |||
137 | } | 138 | } |
138 | }; | 139 | }; |
139 | 140 | ||
140 | this.numericSolver = new NumericSolver(context, method, false); | 141 | this.numericSolver = new NumericSolver(context, method, false,this.configuration.runIntermediateNumericalConsistencyChecks); |
141 | 142 | ||
142 | trajectoiresToExplore = new PriorityQueue<TrajectoryWithFitness>(11, comparator); | 143 | trajectoiresToExplore = new PriorityQueue<TrajectoryWithFitness>(11, comparator); |
143 | } | 144 | } |
144 | 145 | ||
145 | @Override | 146 | @Override |
146 | public void explore() { | 147 | public void explore() { |
148 | this.explorationStarted=System.nanoTime(); | ||
147 | if (!context.checkGlobalConstraints()) { | 149 | if (!context.checkGlobalConstraints()) { |
148 | logger.info("Global contraint is not satisifed in the first state. Terminate."); | 150 | logger.info("Global contraint is not satisifed in the first state. Terminate."); |
149 | return; | 151 | return; |