From 40303748df2676f23b9617335a401678bdf21ed7 Mon Sep 17 00:00:00 2001 From: anqili426 Date: Tue, 31 Mar 2020 10:13:34 -0400 Subject: Added call to form numeric problem templates --- .../inf/dslreasoner/viatra2logic/ExpressionEvaluation2Logic.xtend | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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..a1e18250 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,17 @@ import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.* class ExpressionEvaluation2Logic { val extension LogicProblemBuilder builder = new LogicProblemBuilder + val NumericProblemSolver numericSolver = new NumericProblemSolver def Term transformCheck(XExpression expression, Map variable2Variable) { return expression.transform(variable2Variable) } + def Term transformEval(PVariable target, XExpression expression, Map variable2Variable) { - return target.lookup(variable2Variable) == expression.transform(variable2Variable) + val test = expression.transform(variable2Variable) + numericSolver.formNumericProblemTemplate(expression) + + return test } static val N_Base = "org.eclipse.xtext.xbase.lib." -- cgit v1.2.3-54-g00ecf