diff options
Diffstat (limited to 'Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/ExpressionEvaluation2Logic.xtend')
-rw-r--r-- | Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/ExpressionEvaluation2Logic.xtend | 12 |
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 | |||
13 | import org.eclipse.xtext.xbase.XUnaryOperation | 13 | import org.eclipse.xtext.xbase.XUnaryOperation |
14 | 14 | ||
15 | import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.* | 15 | import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.* |
16 | import com.microsoft.z3.BoolExpr | ||
17 | import java.util.Set | ||
18 | import java.util.List | ||
19 | import org.eclipse.xtext.common.types.JvmIdentifiableElement | ||
20 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PrimitiveElement | ||
21 | 16 | ||
22 | class ExpressionEvaluation2Logic { | 17 | class ExpressionEvaluation2Logic { |
23 | val extension LogicProblemBuilder builder = new LogicProblemBuilder | 18 | val extension LogicProblemBuilder builder = new LogicProblemBuilder |
@@ -28,8 +23,11 @@ class ExpressionEvaluation2Logic { | |||
28 | } | 23 | } |
29 | 24 | ||
30 | def Term transformEval(PVariable target, XExpression expression, Map<PVariable, Variable> variable2Variable) { | 25 | def Term transformEval(PVariable target, XExpression expression, Map<PVariable, Variable> variable2Variable) { |
31 | numericSolver.test(expression); | 26 | // numericSolver.testIsNotSat(expression, expression.transform(variable2Variable)); |
32 | // numericSolver.isSatisfiable(null) | 27 | // numericSolver.testGetOneSol(expression, expression.transform(variable2Variable)); |
28 | numericSolver.testGetOneSol2(expression, expression.transform(variable2Variable)); | ||
29 | // numericSolver.testIsSat(expression, expression.transform(variable2Variable)); | ||
30 | |||
33 | return expression.transform(variable2Variable) | 31 | return expression.transform(variable2Variable) |
34 | } | 32 | } |
35 | 33 | ||