aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar OszkarSemerath <semerath@mit.bme.hu>2022-04-01 20:40:31 +0200
committerLibravatar OszkarSemerath <semerath@mit.bme.hu>2022-04-01 20:40:31 +0200
commit2a117ffb7125e626012a5d26299fdf1be99f9def (patch)
tree539323798db7f1b524512f537ec006b39cf3dfe3
parentNumeric solver dreal hardcoding -> config (diff)
downloadVIATRA-Generator-2a117ffb7125e626012a5d26299fdf1be99f9def.tar.gz
VIATRA-Generator-2a117ffb7125e626012a5d26299fdf1be99f9def.tar.zst
VIATRA-Generator-2a117ffb7125e626012a5d26299fdf1be99f9def.zip
Numeric solver fixes
-rw-r--r--Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/ExpressionEvaluation2Logic.xtend3
-rw-r--r--Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/META-INF/MANIFEST.MF11
2 files changed, 2 insertions, 12 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 f8d3e3bd..8530f824 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
@@ -21,7 +21,8 @@ class ExpressionEvaluation2Logic {
21 def getNumericSolver() { 21 def getNumericSolver() {
22 if(_numericSolver === null) { 22 if(_numericSolver === null) {
23 // it seems like this getter has no use 23 // it seems like this getter has no use
24 _numericSolver = (new NumericTranslator(null, 0)).selectProblemSolver("z3") 24 _numericSolver = new NumericZ3ProblemSolver(-1)
25
25 } 26 }
26 return _numericSolver 27 return _numericSolver
27 } 28 }
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/META-INF/MANIFEST.MF b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/META-INF/MANIFEST.MF
index 754ff55d..1b521cb6 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/META-INF/MANIFEST.MF
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/META-INF/MANIFEST.MF
@@ -14,17 +14,6 @@ Require-Bundle: com.google.guava,
14 org.eclipse.emf.ecore.xmi;bundle-version="2.12.0", 14 org.eclipse.emf.ecore.xmi;bundle-version="2.12.0",
15 guru.nidi.graphviz-java;bundle-version="0.2.1";visibility:=reexport, 15 guru.nidi.graphviz-java;bundle-version="0.2.1";visibility:=reexport,
16 org.apache.batik.transcoder;bundle-version="1.6.0", 16 org.apache.batik.transcoder;bundle-version="1.6.0",
17 org.apache.batik.dom;bundle-version="[1.6.1,1.6.2]",
18 org.apache.batik.bridge;bundle-version="[1.6.0,1.6.1]",
19 org.apache.batik.dom.svg;bundle-version="[1.6.0,1.6.1]",
20 org.apache.batik.util;bundle-version="[1.6.0,1.6.1]",
21 org.apache.batik.css;bundle-version="[1.6.0,1.6.1]",
22 org.apache.batik.parser;bundle-version="[1.6.0,1.6.1]",
23 org.apache.batik.pdf;bundle-version="[1.6.0,1.6.1]",
24 org.apache.batik.svggen;bundle-version="[1.6.0,1.6.1]",
25 org.apache.batik.xml;bundle-version="[1.6.0,1.6.1]",
26 org.apache.batik.ext.awt;bundle-version="[1.6.0,1.6.1]",
27 org.apache.batik.util.gui;bundle-version="[1.6.0,1.6.1]",
28 org.apache.xerces;bundle-version="2.9.0", 17 org.apache.xerces;bundle-version="2.9.0",
29 org.w3c.dom.svg;bundle-version="1.1.0", 18 org.w3c.dom.svg;bundle-version="1.1.0",
30 org.w3c.css.sac;bundle-version="1.3.1" 19 org.w3c.css.sac;bundle-version="1.3.1"