VAMPIRE: post-submission push

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 {
         public def transformOutput(LogicProblem problem, int requiredNumberOfSolution, MonitoredAlloySolution monitoredAlloySolution, Logic2AlloyLanguageMapperTrace trace, long transformationTime) {

                 val models = monitoredAlloySolution.aswers.map[it.key].toList

                 

-                if(!monitoredAlloySolution.finishedBeforeTimeout) {

-                        return createInsuficientResourcesResult => [

-                                it.problem = problem

-                                it.representation += models

-                                it.trace = trace

-                                it.statistics = transformStatistics(monitoredAlloySolution,transformationTime)

-                        ]

-                } else {

-                        if(models.last.satisfiable || requiredNumberOfSolution == -1) {

+//              if(!monitoredAlloySolution.finishedBeforeTimeout) {

+//                      return createInsuficientResourcesResult => [

+//                              it.problem = problem

+//                              it.representation += models

+//                              it.trace = trace

+//                              it.statistics = transformStatistics(monitoredAlloySolution,transformationTime)

+//                      ]

+//              } else {

+                        if((!models.isEmpty && models.last.satisfiable) || requiredNumberOfSolution == -1) {

                                 return createModelResult => [

                                         it.problem = problem

                                         it.representation += models

@@ -32,7 +32,7 @@ class Alloy2LogicMapper {
                                         it.statistics = transformStatistics(monitoredAlloySolution,transformationTime)

                                 ]

                         }

-                }

+//              }

         }

         

         def transformStatistics(MonitoredAlloySolution solution, long transformationTime) {