From d2478be3f7ad7ebfe60125aa555388fe79003fe2 Mon Sep 17 00:00:00 2001 From: OszkarSemerath Date: Sat, 3 Mar 2018 02:03:09 -0500 Subject: Alloy solver report progress and does not call solver if cancelled --- .../src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/AlloySolver.xtend | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/AlloySolver.xtend') 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{ workspace.writeModel(alloyProblem,fileName) } val transformationTime = System.currentTimeMillis - transformationStart + alloyConfig.progressMonitor.workedForwardTransformation // Finish: Logic -> Alloy mapping // Start: Solving Alloy problem //val solverStart = System.currentTimeMillis val result2 = handler.callSolver(alloyProblem,workspace,alloyConfig,alloyCode) + alloyConfig.progressMonitor.workedSearchFinished + val logicResult = backwardMapper.transformOutput(problem,configuration.solutionScope.numberOfRequiredSolution,result2,forwardTrace,transformationTime) + alloyConfig.progressMonitor.workedBackwardTransformationFinished //val solverFinish = System.currentTimeMillis-solverStart // Finish: Solving Alloy problem -- cgit v1.2.3-70-g09d2