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 | 10 |
1 files changed, 9 insertions, 1 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 f474ded4..a27e8904 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 | |||
@@ -16,12 +16,20 @@ import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.* | |||
16 | 16 | ||
17 | class ExpressionEvaluation2Logic { | 17 | class ExpressionEvaluation2Logic { |
18 | val extension LogicProblemBuilder builder = new LogicProblemBuilder | 18 | val extension LogicProblemBuilder builder = new LogicProblemBuilder |
19 | val NumericProblemSolver numericSolver = new NumericProblemSolver | ||
19 | 20 | ||
20 | def Term transformCheck(XExpression expression, Map<PVariable, Variable> variable2Variable) { | 21 | def Term transformCheck(XExpression expression, Map<PVariable, Variable> variable2Variable) { |
21 | return expression.transform(variable2Variable) | 22 | return expression.transform(variable2Variable) |
22 | } | 23 | } |
24 | |||
23 | def Term transformEval(PVariable target, XExpression expression, Map<PVariable, Variable> variable2Variable) { | 25 | def Term transformEval(PVariable target, XExpression expression, Map<PVariable, Variable> variable2Variable) { |
24 | return target.lookup(variable2Variable) == expression.transform(variable2Variable) | 26 | // numericSolver.testIsNotSat(expression, expression.transform(variable2Variable)); |
27 | // numericSolver.testGetOneSol(expression, expression.transform(variable2Variable)); | ||
28 | // numericSolver.testGetOneSol2(expression, expression.transform(variable2Variable)); | ||
29 | numericSolver.testGetOneSol3(expression, expression.transform(variable2Variable)); | ||
30 | // numericSolver.testIsSat(expression, expression.transform(variable2Variable)); | ||
31 | |||
32 | return expression.transform(variable2Variable) | ||
25 | } | 33 | } |
26 | 34 | ||
27 | static val N_Base = "org.eclipse.xtext.xbase.lib." | 35 | static val N_Base = "org.eclipse.xtext.xbase.lib." |