diff options
Diffstat (limited to 'Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/Alloy2LogicMapper.xtend')
| -rw-r--r-- | Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/Alloy2LogicMapper.xtend | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/Alloy2LogicMapper.xtend b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/Alloy2LogicMapper.xtend index 2efd6b29..59ec2ae4 100644 --- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/Alloy2LogicMapper.xtend +++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/Alloy2LogicMapper.xtend | |||
| @@ -9,15 +9,15 @@ class Alloy2LogicMapper { | |||
| 9 | public def transformOutput(LogicProblem problem, int requiredNumberOfSolution, MonitoredAlloySolution monitoredAlloySolution, Logic2AlloyLanguageMapperTrace trace, long transformationTime) { | 9 | public def transformOutput(LogicProblem problem, int requiredNumberOfSolution, MonitoredAlloySolution monitoredAlloySolution, Logic2AlloyLanguageMapperTrace trace, long transformationTime) { |
| 10 | val models = monitoredAlloySolution.aswers.map[it.key].toList | 10 | val models = monitoredAlloySolution.aswers.map[it.key].toList |
| 11 | 11 | ||
| 12 | if(!monitoredAlloySolution.finishedBeforeTimeout) { | 12 | // if(!monitoredAlloySolution.finishedBeforeTimeout) { |
| 13 | return createInsuficientResourcesResult => [ | 13 | // return createInsuficientResourcesResult => [ |
| 14 | it.problem = problem | 14 | // it.problem = problem |
| 15 | it.representation += models | 15 | // it.representation += models |
| 16 | it.trace = trace | 16 | // it.trace = trace |
| 17 | it.statistics = transformStatistics(monitoredAlloySolution,transformationTime) | 17 | // it.statistics = transformStatistics(monitoredAlloySolution,transformationTime) |
| 18 | ] | 18 | // ] |
| 19 | } else { | 19 | // } else { |
| 20 | if(models.last.satisfiable || requiredNumberOfSolution == -1) { | 20 | if((!models.isEmpty && models.last.satisfiable) || requiredNumberOfSolution == -1) { |
| 21 | return createModelResult => [ | 21 | return createModelResult => [ |
| 22 | it.problem = problem | 22 | it.problem = problem |
| 23 | it.representation += models | 23 | it.representation += models |
| @@ -32,7 +32,7 @@ class Alloy2LogicMapper { | |||
| 32 | it.statistics = transformStatistics(monitoredAlloySolution,transformationTime) | 32 | it.statistics = transformStatistics(monitoredAlloySolution,transformationTime) |
| 33 | ] | 33 | ] |
| 34 | } | 34 | } |
| 35 | } | 35 | // } |
| 36 | } | 36 | } |
| 37 | 37 | ||
| 38 | def transformStatistics(MonitoredAlloySolution solution, long transformationTime) { | 38 | def transformStatistics(MonitoredAlloySolution solution, long transformationTime) { |