diff options
author | Kristóf Marussy <marussy@mit.bme.hu> | 2020-11-26 13:56:17 +0100 |
---|---|---|
committer | Kristóf Marussy <marussy@mit.bme.hu> | 2020-11-26 13:56:17 +0100 |
commit | 8a219bb3ee05e16a8da20247947addb86bf9cb96 (patch) | |
tree | 67163ee3fe180ab41d0926614737d4db840add8d /Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner | |
parent | Fix Z3 dependency (diff) | |
parent | NumericProblemSolver is initialized only if it is necessary (diff) | |
download | VIATRA-Generator-8a219bb3ee05e16a8da20247947addb86bf9cb96.tar.gz VIATRA-Generator-8a219bb3ee05e16a8da20247947addb86bf9cb96.tar.zst VIATRA-Generator-8a219bb3ee05e16a8da20247947addb86bf9cb96.zip |
Merge branch 'master' of github.com:viatra/VIATRA-Generator
Diffstat (limited to 'Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner')
-rw-r--r-- | Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/ExpressionEvaluation2Logic.xtend | 10 |
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 | |||
12 | import org.eclipse.xtext.xbase.XNumberLiteral | 12 | 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.* | ||
16 | |||
17 | class ExpressionEvaluation2Logic { | 15 | class ExpressionEvaluation2Logic { |
18 | val extension LogicProblemBuilder builder = new LogicProblemBuilder | 16 | val extension LogicProblemBuilder builder = new LogicProblemBuilder |
19 | val NumericProblemSolver numericSolver = new NumericProblemSolver | 17 | var NumericProblemSolver _numericSolver = null //new NumericProblemSolver |
18 | def getNumericSolver() { | ||
19 | if(_numericSolver === null) { | ||
20 | _numericSolver = new NumericProblemSolver | ||
21 | } | ||
22 | return _numericSolver | ||
23 | } | ||
20 | 24 | ||
21 | def Term transformCheck(XExpression expression, Map<PVariable, Variable> variable2Variable) { | 25 | def Term transformCheck(XExpression expression, Map<PVariable, Variable> variable2Variable) { |
22 | return expression.transform(variable2Variable) | 26 | return expression.transform(variable2Variable) |