aboutsummaryrefslogtreecommitdiffstats
path: root/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/NumericSolver.xtend
diff options
context:
space:
mode:
Diffstat (limited to 'Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/NumericSolver.xtend')
-rw-r--r--Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/NumericSolver.xtend7
1 files changed, 4 insertions, 3 deletions
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 4b0ea544..ab3e6601 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
@@ -98,11 +98,12 @@ class NumericSolver {
98 finalResult=true 98 finalResult=true
99 } else { 99 } else {
100 val propagatedConstraints = new HashMap 100 val propagatedConstraints = new HashMap
101 println("------ Any matches?")
101 for(entry : matches.entrySet) { 102 for(entry : matches.entrySet) {
102 val constraint = entry.key 103 val constraint = entry.key
103 //println(constraint) 104 println("------ " + constraint)
104 val allMatches = entry.value.allMatches.map[it.toArray] 105 val allMatches = entry.value.allMatches.map[it.toArray]
105 //println(allMatches.toList) 106 println("------ " + allMatches.toList)
106 propagatedConstraints.put(constraint,allMatches) 107 propagatedConstraints.put(constraint,allMatches)
107 } 108 }
108 if(propagatedConstraints.values.forall[empty]) { 109 if(propagatedConstraints.values.forall[empty]) {
@@ -198,6 +199,6 @@ class NumericSolver {
198 199
199 def protected dispatch fillWithValue(BooleanElement e, Object value) {e.valueSet=true e.value=value as Boolean} 200 def protected dispatch fillWithValue(BooleanElement e, Object value) {e.valueSet=true e.value=value as Boolean}
200 def protected dispatch fillWithValue(IntegerElement e, Object value) {e.valueSet=true e.value=value as Integer} 201 def protected dispatch fillWithValue(IntegerElement e, Object value) {e.valueSet=true e.value=value as Integer}
201 def protected dispatch fillWithValue(RealElement e, Object value) {e.valueSet=true e.value=BigDecimal.valueOf(value as Double) } 202 def protected dispatch fillWithValue(RealElement e, Object value) {e.valueSet=true e.value=value as Double }
202 def protected dispatch fillWithValue(StringElement e, Object value) {e.valueSet=true e.value=value as String} 203 def protected dispatch fillWithValue(StringElement e, Object value) {e.valueSet=true e.value=value as String}
203} \ No newline at end of file 204} \ No newline at end of file