diff options
| author |  Aren Babikian <aren.babikian@mail.mcgill.ca> | 2020-12-14 03:27:43 -0500 |
|---|---|---|
| committer | Aren Babikian <aren.babikian@mail.mcgill.ca> | 2021-01-06 00:02:49 +0100 |
| commit | 8fd50f7d4a979117a1e643f5384b76f4a3e36801 (patch) | |
| tree | a5bb21af9c982f18bd216b1f9c98f9548169a2e2 /Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf | |
| parent | add numericProblemSolver supertype (diff) | |
| download | VIATRA-Generator-8fd50f7d4a979117a1e643f5384b76f4a3e36801.tar.gz VIATRA-Generator-8fd50f7d4a979117a1e643f5384b76f4a3e36801.tar.zst VIATRA-Generator-8fd50f7d4a979117a1e643f5384b76f4a3e36801.zip | |
implement isSatisfiable with Dreal integration
Diffstat (limited to 'Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf')
2 files changed, 4 insertions, 0 deletions
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend index 8e992741..1f902b90 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend | |||
| @@ -163,6 +163,9 @@ class ViatraReasoner extends LogicReasoner { | |||
| 163 | } | 163 | } |
| 164 | val solverTime = System.nanoTime - solverStartTime | 164 | val solverTime = System.nanoTime - solverStartTime |
| 165 | viatraConfig.progressMonitor.workedSearchFinished | 165 | viatraConfig.progressMonitor.workedSearchFinished |
| 166 | |||
| 167 | //dreal teardown | ||
| 168 | numericSolver.numericDrealSolver.teardown() | ||
| 166 | 169 | ||
| 167 | // additionalMatches = strategy.solutionStoreWithCopy.additionalMatches | 170 | // additionalMatches = strategy.solutionStoreWithCopy.additionalMatches |
| 168 | val statistics = createStatistics => [ | 171 | val statistics = createStatistics => [ |
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/NumericSolver.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/NumericSolver.xtend index 70e8e9c2..0e789671 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/NumericSolver.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/NumericSolver.xtend | |||
| @@ -68,6 +68,7 @@ class NumericSolver { | |||
| 68 | def getSolverFormingProblem(){this.t.formingProblemTime} | 68 | def getSolverFormingProblem(){this.t.formingProblemTime} |
| 69 | def getSolverSolvingProblem(){this.t.solvingProblemTime} | 69 | def getSolverSolvingProblem(){this.t.solvingProblemTime} |
| 70 | def getSolverSolution(){this.t.formingSolutionTime} | 70 | def getSolverSolution(){this.t.formingSolutionTime} |
| 71 | def getNumericDrealSolver(){this.t.drealSolver} | ||
| 71 | 72 | ||
| 72 | def boolean maySatisfiable() { | 73 | def boolean maySatisfiable() { |
| 73 | if(intermediateConsistencyCheck) { | 74 | if(intermediateConsistencyCheck) { |