diff options
Diffstat (limited to 'Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit')
2 files changed, 4 insertions, 4 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 432651af..ceb78e99 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 | |||
| @@ -57,7 +57,7 @@ class AlloySolver extends LogicReasoner{ | |||
| 57 | val result2 = handler.callSolver(alloyProblem,workspace,alloyConfig,alloyCode) | 57 | val result2 = handler.callSolver(alloyProblem,workspace,alloyConfig,alloyCode) |
| 58 | alloyConfig.progressMonitor.workedSearchFinished | 58 | alloyConfig.progressMonitor.workedSearchFinished |
| 59 | 59 | ||
| 60 | val logicResult = backwardMapper.transformOutput(problem,configuration.solutionScope.numberOfRequiredSolution,result2,forwardTrace,transformationTime) | 60 | val logicResult = backwardMapper.transformOutput(problem,configuration.solutionScope.numberOfRequiredSolutions,result2,forwardTrace,transformationTime) |
| 61 | alloyConfig.progressMonitor.workedBackwardTransformationFinished | 61 | alloyConfig.progressMonitor.workedBackwardTransformationFinished |
| 62 | //val solverFinish = System.currentTimeMillis-solverStart | 62 | //val solverFinish = System.currentTimeMillis-solverStart |
| 63 | // Finish: Solving Alloy problem | 63 | // Finish: Solving Alloy problem |
diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/AlloyHandler.xtend b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/AlloyHandler.xtend index 9b4265b9..ed2ef6b7 100644 --- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/AlloyHandler.xtend +++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/AlloyHandler.xtend | |||
| @@ -195,7 +195,7 @@ class AlloyCallerWithTimeout implements Callable<List<Pair<A4Solution,Long>>>{ | |||
| 195 | } else { | 195 | } else { |
| 196 | lastAnswer = lastAnswer.next | 196 | lastAnswer = lastAnswer.next |
| 197 | } | 197 | } |
| 198 | configuration.progressMonitor.workedBackwardTransformation(configuration.solutionScope.numberOfRequiredSolution) | 198 | configuration.progressMonitor.workedBackwardTransformation(configuration.solutionScope.numberOfRequiredSolutions) |
| 199 | 199 | ||
| 200 | val runtime = System.currentTimeMillis -startTime | 200 | val runtime = System.currentTimeMillis -startTime |
| 201 | synchronized(this) { | 201 | synchronized(this) { |
| @@ -212,8 +212,8 @@ class AlloyCallerWithTimeout implements Callable<List<Pair<A4Solution,Long>>>{ | |||
| 212 | } | 212 | } |
| 213 | 213 | ||
| 214 | def hasEnoughSolution(List<?> answers) { | 214 | def hasEnoughSolution(List<?> answers) { |
| 215 | if(configuration.solutionScope.numberOfRequiredSolution < 0) return false | 215 | if(configuration.solutionScope.numberOfRequiredSolutions < 0) return false |
| 216 | else return answers.size() == configuration.solutionScope.numberOfRequiredSolution | 216 | else return answers.size() == configuration.solutionScope.numberOfRequiredSolutions |
| 217 | } | 217 | } |
| 218 | 218 | ||
| 219 | public def getPartialAnswers() { | 219 | public def getPartialAnswers() { |