diff options
author | 2018-03-03 02:03:09 -0500 | |
---|---|---|
committer | 2018-03-03 02:03:09 -0500 | |
commit | d2478be3f7ad7ebfe60125aa555388fe79003fe2 (patch) | |
tree | 7d9e16adfdca5c356f21d595f08df28a150a8bb3 /Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/AlloySolver.xtend | |
parent | ViatraSolver reports progress and stops at cancel (diff) | |
download | VIATRA-Generator-d2478be3f7ad7ebfe60125aa555388fe79003fe2.tar.gz VIATRA-Generator-d2478be3f7ad7ebfe60125aa555388fe79003fe2.tar.zst VIATRA-Generator-d2478be3f7ad7ebfe60125aa555388fe79003fe2.zip |
Alloy solver report progress and does not call solver if cancelled
Diffstat (limited to 'Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/AlloySolver.xtend')
-rw-r--r-- | Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/AlloySolver.xtend | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/AlloySolver.xtend b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/AlloySolver.xtend index 1658a5b8..e664b3b5 100644 --- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/AlloySolver.xtend +++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/AlloySolver.xtend | |||
@@ -49,12 +49,16 @@ class AlloySolver extends LogicReasoner{ | |||
49 | workspace.writeModel(alloyProblem,fileName) | 49 | workspace.writeModel(alloyProblem,fileName) |
50 | } | 50 | } |
51 | val transformationTime = System.currentTimeMillis - transformationStart | 51 | val transformationTime = System.currentTimeMillis - transformationStart |
52 | alloyConfig.progressMonitor.workedForwardTransformation | ||
52 | // Finish: Logic -> Alloy mapping | 53 | // Finish: Logic -> Alloy mapping |
53 | 54 | ||
54 | // Start: Solving Alloy problem | 55 | // Start: Solving Alloy problem |
55 | //val solverStart = System.currentTimeMillis | 56 | //val solverStart = System.currentTimeMillis |
56 | val result2 = handler.callSolver(alloyProblem,workspace,alloyConfig,alloyCode) | 57 | val result2 = handler.callSolver(alloyProblem,workspace,alloyConfig,alloyCode) |
58 | alloyConfig.progressMonitor.workedSearchFinished | ||
59 | |||
57 | val logicResult = backwardMapper.transformOutput(problem,configuration.solutionScope.numberOfRequiredSolution,result2,forwardTrace,transformationTime) | 60 | val logicResult = backwardMapper.transformOutput(problem,configuration.solutionScope.numberOfRequiredSolution,result2,forwardTrace,transformationTime) |
61 | alloyConfig.progressMonitor.workedBackwardTransformationFinished | ||
58 | //val solverFinish = System.currentTimeMillis-solverStart | 62 | //val solverFinish = System.currentTimeMillis-solverStart |
59 | // Finish: Solving Alloy problem | 63 | // Finish: Solving Alloy problem |
60 | 64 | ||