Merge branch 'master' of github.com:viatra/VIATRA-Generator

1 files changed, 7 insertions, 3 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 b4303739..6393121b 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
@@ -12,11 +12,15 @@ import org.eclipse.xtext.xbase.XMemberFeatureCall
 import org.eclipse.xtext.xbase.XNumberLiteral

 import org.eclipse.xtext.xbase.XUnaryOperation

 

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

-

 class ExpressionEvaluation2Logic {

         val extension LogicProblemBuilder builder = new LogicProblemBuilder

-        val NumericProblemSolver numericSolver = new NumericProblemSolver

+        var NumericProblemSolver _numericSolver = null //new NumericProblemSolver

+        def getNumericSolver() {

+                if(_numericSolver === null) {

+                        _numericSolver = new NumericProblemSolver

+                }

+                return _numericSolver

+        }

         

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

                 return expression.transform(variable2Variable)