From 41a48543aea119acae321aae61b85d711610b652 Mon Sep 17 00:00:00 2001
From: Aren Babikian <aren.babikian@mail.mcgill.ca>
Date: Wed, 20 Jan 2021 08:44:27 +0100
Subject: almost finish crossscen VQL + implement ITE handling + prelim results

---
 .../viatrasolver/reasoner/ViatraReasonerConfiguration.xtend            | 2 +-
 .../mit/inf/dslreasoner/viatrasolver/reasoner/dse/NumericSolver.xtend  | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner')

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 {
 	public var nonContainmentWeight = 1
 	public var unfinishedWFWeight = 1
 	public var calculateObjectCreationCosts = false
-	public var numericSolverSelection = NumericSolverSelection.DREAL_DOCKER //currently defaulted to DREAL
+	public NumericSolverSelection numericSolverSelection = NumericSolverSelection.DREAL_DOCKER //currently defaulted to DREAL
 	public var drealLocalPath = "<path-to-dreal>";
 	
 	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
 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethod
 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.NumericSolverSelection
 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ViatraReasonerConfiguration
-import java.math.BigDecimal
 import java.util.HashMap
 import java.util.LinkedHashMap
 import java.util.LinkedHashSet
@@ -103,7 +102,7 @@ class NumericSolver {
 			finalResult=true
 		} else {
 			val propagatedConstraints = new HashMap
-			println("<<<<START-STEP>>>>")
+//			println("<<<<START-STEP>>>>")
 			for(entry : matches.entrySet) {
 				val constraint = entry.key
 //				println("--match?-- " + constraint)
-- 
cgit v1.2.3-54-g00ecf