diff options
Diffstat (limited to 'Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/AlloyHandler.xtend')
-rw-r--r-- | Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/AlloyHandler.xtend | 7 |
1 files changed, 3 insertions, 4 deletions
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 17220776..c1f2ec4c 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 | |||
@@ -191,10 +191,9 @@ class AlloyCallerWithTimeout implements Callable<List<Pair<A4Solution,Long>>>{ | |||
191 | 191 | ||
192 | val runtime = System.currentTimeMillis -startTime | 192 | val runtime = System.currentTimeMillis -startTime |
193 | synchronized(this) { | 193 | synchronized(this) { |
194 | answers += lastAnswer->runtime | 194 | answers += (lastAnswer->runtime) |
195 | } | 195 | } |
196 | println( answers.size ) | 196 | } while(lastAnswer.satisfiable != false && !hasEnoughSolution(answers)) |
197 | } while(lastAnswer.satisfiable != false && hasEnoughSolution(answers)) | ||
198 | 197 | ||
199 | }catch(Exception e) { | 198 | }catch(Exception e) { |
200 | warnings +=e.message | 199 | warnings +=e.message |
@@ -205,7 +204,7 @@ class AlloyCallerWithTimeout implements Callable<List<Pair<A4Solution,Long>>>{ | |||
205 | 204 | ||
206 | def hasEnoughSolution(List<?> answers) { | 205 | def hasEnoughSolution(List<?> answers) { |
207 | if(numberOfRequiredSolution < 0) return false | 206 | if(numberOfRequiredSolution < 0) return false |
208 | else return answers.size < numberOfRequiredSolution | 207 | else return answers.size() == numberOfRequiredSolution |
209 | } | 208 | } |
210 | 209 | ||
211 | public def getPartialAnswers() { | 210 | public def getPartialAnswers() { |