diff options
Diffstat (limited to 'Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/VampireSolver.xtend')
-rw-r--r-- | Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/VampireSolver.xtend | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/VampireSolver.xtend b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/VampireSolver.xtend index 042caa86..59084843 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/VampireSolver.xtend +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/VampireSolver.xtend | |||
@@ -153,21 +153,21 @@ class VampireSolver extends LogicReasoner { | |||
153 | val MonitoredVampireSolution vampSol = handler.callSolver(vampireProblem, workspace, vampireConfig) | 153 | val MonitoredVampireSolution vampSol = handler.callSolver(vampireProblem, workspace, vampireConfig) |
154 | // Finish: Solving .tptp problem | 154 | // Finish: Solving .tptp problem |
155 | // Start: Vampire -> Logic mapping | 155 | // Start: Vampire -> Logic mapping |
156 | val backTransformationStart = System.currentTimeMillis | 156 | // val backTransformationStart = System.currentTimeMillis |
157 | // Backwards Mapper | 157 | // // Backwards Mapper |
158 | val logicResult = backwardMapper.transformOutput(problem, | 158 | // val logicResult = backwardMapper.transformOutput(problem, |
159 | vampireConfig.solutionScope.numberOfRequiredSolution, vampSol, forwardTrace, transformationTime) | 159 | // vampireConfig.solutionScope.numberOfRequiredSolution, vampSol, forwardTrace, transformationTime) |
160 | 160 | // | |
161 | val backTransformationTime = System.currentTimeMillis - backTransformationStart | 161 | // val backTransformationTime = System.currentTimeMillis - backTransformationStart |
162 | // Finish: Vampire -> Logic Mapping | 162 | // Finish: Vampire -> Logic Mapping |
163 | // print(vampSol.generatedModel.tfformulas.size) | 163 | // print(vampSol.generatedModel.tfformulas.size) |
164 | 164 | ||
165 | // return logicResult // currently only a ModelResult | 165 | // return logicResult // currently only a ModelResult |
166 | 166 | ||
167 | var model = vampSol.generatedModel.confirmations.filter[class == VLSFiniteModelImpl] | 167 | // var model = vampSol.generatedModel.confirmations.filter[class == VLSFiniteModelImpl] |
168 | // | 168 | // |
169 | var modOut = "no" | 169 | var modOut = "no" |
170 | if(model.length >0){ | 170 | if(vampSol.finiteModelGenerated){ |
171 | modOut = "FiniteModel" | 171 | modOut = "FiniteModel" |
172 | } | 172 | } |
173 | 173 | ||
@@ -201,8 +201,8 @@ class VampireSolver extends LogicReasoner { | |||
201 | ] | 201 | ] |
202 | } | 202 | } |
203 | } | 203 | } |
204 | return backwardMapper.transformOutput(problem, vampireConfig.solutionScope.numberOfRequiredSolution, | 204 | // return backwardMapper.transformOutput(problem, vampireConfig.solutionScope.numberOfRequiredSolution, |
205 | new MonitoredVampireSolution(-1, null), forwardTrace, transformationTime) | 205 | // new MonitoredVampireSolution(-1, null), forwardTrace, transformationTime) |
206 | } | 206 | } |
207 | 207 | ||
208 | def asConfig(LogicSolverConfiguration configuration) { | 208 | def asConfig(LogicSolverConfiguration configuration) { |