Merge branch 'master' into TACAS2021

uclid-org · Oct 23, 2020 · 0d72818 · 0d72818
2 parents 0ec8f72 + c42d7bc
commit 0d72818
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/medleysolver/constants.py b/medleysolver/constants.py
@@ -1,12 +1,12 @@
 from collections import OrderedDict, namedtuple
 
 SOLVERS = OrderedDict({
-    "Z3"   : "z3",
+    "Z3"   : "~/tools/z3/bin/z3",
     "CVC4" : "~/tools/cvc4",
-    "BOOLECTOR" : "~/tools/boolector/boolector/bin/boolector",
-    "YICES": "~/bin/yices-smt2",
+    "BOOLECTOR" : "~/tools/boolector/build/bin/boolector",
+    "YICES": "~/tools/yices/bin/yices-smt2",
     "MathSAT": "~/tools/mathsat/bin/mathsat",
-    "Bitwuzla": "~/tools/Bitwuzla/bin/bitwuzla",
+    "Bitwuzla": "~/tools/bitwuzla/bin/bitwuzla",
 })
 
 SAT_RESULT     = 'sat'

diff --git a/setup.py b/setup.py
@@ -14,8 +14,9 @@
     packages     = find_packages(),
     install_requires = [
         'numpy',
-        'z3',
+        'z3-solver',
         'tqdm',
-        'dill'
+        'dill',
+        'sklearn',
     ],
-)
+)