diff options
author | Aren Babikian <aren.babikian@mail.mcgill.ca> | 2021-01-20 08:44:27 +0100 |
---|---|---|
committer | Aren Babikian <aren.babikian@mail.mcgill.ca> | 2021-01-20 08:44:27 +0100 |
commit | 41a48543aea119acae321aae61b85d711610b652 (patch) | |
tree | da29d1d172eaaa4c9744d77851966b727720ce06 /Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner | |
parent | add Actor+CollisionExists constrs & adjust dreal parser & measurements (diff) | |
download | VIATRA-Generator-41a48543aea119acae321aae61b85d711610b652.tar.gz VIATRA-Generator-41a48543aea119acae321aae61b85d711610b652.tar.zst VIATRA-Generator-41a48543aea119acae321aae61b85d711610b652.zip |
almost finish crossscen VQL + implement ITE handling + prelim results
Diffstat (limited to 'Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner')
2 files changed, 2 insertions, 3 deletions
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasonerConfiguration.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasonerConfiguration.xtend index c0daaad2..759f434b 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasonerConfiguration.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasonerConfiguration.xtend | |||
@@ -76,7 +76,7 @@ class ViatraReasonerConfiguration extends LogicSolverConfiguration { | |||
76 | public var nonContainmentWeight = 1 | 76 | public var nonContainmentWeight = 1 |
77 | public var unfinishedWFWeight = 1 | 77 | public var unfinishedWFWeight = 1 |
78 | public var calculateObjectCreationCosts = false | 78 | public var calculateObjectCreationCosts = false |
79 | public var numericSolverSelection = NumericSolverSelection.DREAL_DOCKER //currently defaulted to DREAL | 79 | public NumericSolverSelection numericSolverSelection = NumericSolverSelection.DREAL_DOCKER //currently defaulted to DREAL |
80 | public var drealLocalPath = "<path-to-dreal>"; | 80 | public var drealLocalPath = "<path-to-dreal>"; |
81 | 81 | ||
82 | public var ScopePropagatorStrategy scopePropagatorStrategy = new ScopePropagatorStrategy.Polyhedral( | 82 | public var ScopePropagatorStrategy scopePropagatorStrategy = new ScopePropagatorStrategy.Polyhedral( |
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 9223ecc8..fc1a616b 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 | |||
@@ -12,7 +12,6 @@ import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.par | |||
12 | import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethod | 12 | import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethod |
13 | import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.NumericSolverSelection | 13 | import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.NumericSolverSelection |
14 | import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ViatraReasonerConfiguration | 14 | import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ViatraReasonerConfiguration |
15 | import java.math.BigDecimal | ||
16 | import java.util.HashMap | 15 | import java.util.HashMap |
17 | import java.util.LinkedHashMap | 16 | import java.util.LinkedHashMap |
18 | import java.util.LinkedHashSet | 17 | import java.util.LinkedHashSet |
@@ -103,7 +102,7 @@ class NumericSolver { | |||
103 | finalResult=true | 102 | finalResult=true |
104 | } else { | 103 | } else { |
105 | val propagatedConstraints = new HashMap | 104 | val propagatedConstraints = new HashMap |
106 | println("<<<<START-STEP>>>>") | 105 | // println("<<<<START-STEP>>>>") |
107 | for(entry : matches.entrySet) { | 106 | for(entry : matches.entrySet) { |
108 | val constraint = entry.key | 107 | val constraint = entry.key |
109 | // println("--match?-- " + constraint) | 108 | // println("--match?-- " + constraint) |