diff options
author | anqili426 <mollisterkl@outlook.com> | 2020-04-08 14:15:22 -0400 |
---|---|---|
committer | anqili426 <mollisterkl@outlook.com> | 2020-04-08 14:15:22 -0400 |
commit | db7f0ebb8efc522990835d8a042db8141856cf5c (patch) | |
tree | 88cc3a6432bf18d3a1d2f00fd7edb61a7f38eead /Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/ExpressionEvaluation2Logic.xtend | |
parent | Added logic to create a numeric problem instance with pattern matches (diff) | |
download | VIATRA-Generator-db7f0ebb8efc522990835d8a042db8141856cf5c.tar.gz VIATRA-Generator-db7f0ebb8efc522990835d8a042db8141856cf5c.tar.zst VIATRA-Generator-db7f0ebb8efc522990835d8a042db8141856cf5c.zip |
Updated logic that creates a numeric problem using matches
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, 8 insertions, 4 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 a1e18250..adecf1d4 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,6 +13,11 @@ 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 | ||
16 | 21 | ||
17 | class ExpressionEvaluation2Logic { | 22 | class ExpressionEvaluation2Logic { |
18 | val extension LogicProblemBuilder builder = new LogicProblemBuilder | 23 | val extension LogicProblemBuilder builder = new LogicProblemBuilder |
@@ -23,10 +28,9 @@ class ExpressionEvaluation2Logic { | |||
23 | } | 28 | } |
24 | 29 | ||
25 | def Term transformEval(PVariable target, XExpression expression, Map<PVariable, Variable> variable2Variable) { | 30 | def Term transformEval(PVariable target, XExpression expression, Map<PVariable, Variable> variable2Variable) { |
26 | val test = expression.transform(variable2Variable) | 31 | numericSolver.test(expression); |
27 | numericSolver.formNumericProblemTemplate(expression) | 32 | // numericSolver.isSatisfiable(null) |
28 | 33 | return expression.transform(variable2Variable) | |
29 | return test | ||
30 | } | 34 | } |
31 | 35 | ||
32 | static val N_Base = "org.eclipse.xtext.xbase.lib." | 36 | static val N_Base = "org.eclipse.xtext.xbase.lib." |