1 files changed, 5 insertions, 7 deletions

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/ExpressionEvaluation2Logic.xtend b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/ExpressionEvaluation2Logic.xtend
index adecf1d4..569414f0 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/ExpressionEvaluation2Logic.xtend
+++ b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/ExpressionEvaluation2Logic.xtend
@@ -13,11 +13,6 @@ import org.eclipse.xtext.xbase.XNumberLiteral
 import org.eclipse.xtext.xbase.XUnaryOperation

 

 import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.*

-import com.microsoft.z3.BoolExpr

-import java.util.Set

-import java.util.List

-import org.eclipse.xtext.common.types.JvmIdentifiableElement

-import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PrimitiveElement

 

 class ExpressionEvaluation2Logic {

         val extension LogicProblemBuilder builder = new LogicProblemBuilder

@@ -28,8 +23,11 @@ class ExpressionEvaluation2Logic {
         }

         

         def Term transformEval(PVariable target, XExpression expression, Map<PVariable, Variable> variable2Variable) {

-                numericSolver.test(expression);

-//              numericSolver.isSatisfiable(null)

+//              numericSolver.testIsNotSat(expression, expression.transform(variable2Variable));

+//              numericSolver.testGetOneSol(expression, expression.transform(variable2Variable));

+                numericSolver.testGetOneSol2(expression, expression.transform(variable2Variable));

+//              numericSolver.testIsSat(expression, expression.transform(variable2Variable));

+

                 return expression.transform(variable2Variable)

         }