PySMT 0.9.7.dev423__tar.gz → 0.9.7.dev431__tar.gz

{pysmt-0.9.7.dev423/PySMT.egg-info → pysmt-0.9.7.dev431}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PySMT
-Version: 0.9.7.dev423
+Version: 0.9.7.dev431
 Summary: A solver-agnostic library for SMT Formulae manipulation and solving
 Home-page: http://www.pysmt.org
 Author: PySMT Team

{pysmt-0.9.7.dev423 → pysmt-0.9.7.dev431/PySMT.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PySMT
-Version: 0.9.7.dev423
+Version: 0.9.7.dev431
 Summary: A solver-agnostic library for SMT Formulae manipulation and solving
 Home-page: http://www.pysmt.org
 Author: PySMT Team

{pysmt-0.9.7.dev423 → pysmt-0.9.7.dev431}/pysmt/__init__.py

@@ -19,7 +19,7 @@
 from typing import Tuple, Union
 
 
-VERSION: Union[Tuple[int, int, int], Tuple[int, int, int, str, int]] = (0, 9, 7, "dev", 423)
+VERSION: Union[Tuple[int, int, int], Tuple[int, int, int, str, int]] = (0, 9, 7, "dev", 431)
 
 # Try to provide human-readable version of latest commit for dev versions
 # E.g. v0.5.1-4-g49a49f2-wip

{pysmt-0.9.7.dev423 → pysmt-0.9.7.dev431}/pysmt/solvers/msat.py

@@ -322,7 +322,7 @@ class MathSAT5Solver(IncrementalTrackingSolver, UnsatCoreSolver, SmtLibBasicSolv
     def all_sat(self, important, callback):
         self.push()
         self._msat_lib.msat_all_sat(self.msat_env(),
-                             [self._var2term(x) for x in important],
+                             [self.converter.convert(x) for x in important],
                              callback)
         self.pop()
 
@@ -336,11 +336,6 @@ class MathSAT5Solver(IncrementalTrackingSolver, UnsatCoreSolver, SmtLibBasicSolv
         for _ in range(levels):
             self._msat_lib.msat_pop_backtrack_point(self.msat_env())
 
-    def _var2term(self, var):
-        decl = self._msat_lib.msat_find_decl(self.msat_env(), var.symbol_name())
-        titem = self._msat_lib.msat_make_term(self.msat_env(), decl, [])
-        return titem
-
     def set_preferred_var(self, var, val=None):
         tvar = self.converter.convert(var)
         mval = self._msat_lib.MSAT_UNDEF

{pysmt-0.9.7.dev423 → pysmt-0.9.7.dev431}/pysmt/solvers/z3.py

@@ -340,12 +340,12 @@ class Z3Converter(Converter, DagWalker):
             z3.Z3_OP_IMPLIES: lambda args, expr: self.mgr.Implies(args[0], args[1]),
             z3.Z3_OP_ITE: lambda args, expr: self.mgr.Ite(args[0], args[1], args[2]),
             z3.Z3_OP_TO_REAL: lambda args, expr: self.mgr.ToReal(args[0]),
-            z3.Z3_OP_BAND : lambda args, expr: self.mgr.BVAnd(args[0], args[1]),
-            z3.Z3_OP_BOR : lambda args, expr: self.mgr.BVOr(args[0], args[1]),
+            z3.Z3_OP_BAND : lambda args, expr: self.mgr.BVAnd(args),
+            z3.Z3_OP_BOR : lambda args, expr: self.mgr.BVOr(args),
             z3.Z3_OP_BXOR : lambda args, expr: self.mgr.BVXor(args[0], args[1]),
             z3.Z3_OP_BNOT : lambda args, expr: self.mgr.BVNot(args[0]),
             z3.Z3_OP_BNEG : lambda args, expr: self.mgr.BVNeg(args[0]),
-            z3.Z3_OP_CONCAT : lambda args, expr: self.mgr.BVConcat(args[0], args[1]),
+            z3.Z3_OP_CONCAT : lambda args, expr: self.mgr.BVConcat(args),
             z3.Z3_OP_ULT : lambda args, expr: self.mgr.BVULT(args[0], args[1]),
             z3.Z3_OP_ULEQ : lambda args, expr: self.mgr.BVULE(args[0], args[1]),
             z3.Z3_OP_SLT : lambda args, expr: self.mgr.BVSLT(args[0], args[1]),
@@ -354,8 +354,8 @@ class Z3Converter(Converter, DagWalker):
             z3.Z3_OP_UGEQ : lambda args, expr: self.mgr.BVUGE(args[0], args[1]),
             z3.Z3_OP_SGT : lambda args, expr: self.mgr.BVSGT(args[0], args[1]),
             z3.Z3_OP_SGEQ : lambda args, expr: self.mgr.BVSGE(args[0], args[1]),
-            z3.Z3_OP_BADD : lambda args, expr: self.mgr.BVAdd(args[0], args[1]),
-            z3.Z3_OP_BMUL : lambda args, expr: self.mgr.BVMul(args[0], args[1]),
+            z3.Z3_OP_BADD : lambda args, expr: self.mgr.BVAdd(args),
+            z3.Z3_OP_BMUL : lambda args, expr: self.mgr.BVMul(args),
             z3.Z3_OP_BUDIV : lambda args, expr: self.mgr.BVUDiv(args[0], args[1]),
             z3.Z3_OP_BSDIV : lambda args, expr: self.mgr.BVSDiv(args[0], args[1]),
             z3.Z3_OP_BUREM : lambda args, expr: self.mgr.BVURem(args[0], args[1]),
@@ -513,6 +513,9 @@ class Z3Converter(Converter, DagWalker):
         assert not len(args) > 2 or \
             (z3.is_and(expr) or z3.is_or(expr) or
              z3.is_add(expr) or z3.is_mul(expr) or
+             z3.is_app_of(expr, z3.Z3_OP_BAND) or z3.is_app_of(expr, z3.Z3_OP_BOR) or
+             z3.is_app_of(expr, z3.Z3_OP_BADD) or z3.is_app_of(expr, z3.Z3_OP_BMUL) or
+             z3.is_app_of(expr, z3.Z3_OP_CONCAT) or
              (len(args) == 3 and (z3.is_ite(expr) or z3.is_array_store(expr)))),\
             "Unexpected n-ary term: %s" % expr
 

{pysmt-0.9.7.dev423 → pysmt-0.9.7.dev431}/pysmt/test/test_back.py

@@ -16,11 +16,12 @@
 #   limitations under the License.
 #
 from pysmt.shortcuts import FreshSymbol, GT, And, Plus, Real, Int, LE, Iff
-from pysmt.shortcuts import Solver
-from pysmt.typing import REAL, INT
+from pysmt.shortcuts import Solver, Symbol, EqualsOrIff
+from pysmt.shortcuts import BVAdd, BVMul, BVAnd, BVOr, BVConcat
+from pysmt.typing import REAL, INT, BVType
 from pysmt.test import TestCase, skipIfSolverNotAvailable, main
 from pysmt.test.examples import get_example_formulae
-from pysmt.logics import QF_UFLIRA
+from pysmt.logics import QF_UFLIRA, QF_BV
 from pysmt.exceptions import NoSolverAvailableError
 
 
@@ -87,6 +88,31 @@ class TestBasic(TestCase):
         self.do_back("z3", via_smtlib=True)
         self.do_back("z3", via_smtlib=False)
 
+    @skipIfSolverNotAvailable("z3")
+    def test_z3_back_nary_bv(self):
+        # Z3 simplification can produce n-ary (more than two arguments)
+        # bit-vector operations. Back-converting them used to fail because
+        # only the binary case was handled (unlike the integer operations).
+        import z3 # type: ignore[import]
+
+        s = Solver(name="z3", logic=QF_BV)
+        conv = s.converter
+        a = Symbol("a", BVType(8))
+        b = Symbol("b", BVType(8))
+        c = Symbol("c", BVType(8))
+
+        for f in (BVAdd(BVAdd(a, b), c),
+                  BVMul(BVMul(a, b), c),
+                  BVAnd(BVAnd(a, b), c),
+                  BVOr(BVOr(a, b), c),
+                  BVConcat(BVConcat(a, b), c)):
+            # Simplify in Z3 to flatten the associative operators into a
+            # single n-ary application before converting back.
+            simplified = z3.simplify(conv.convert(f))
+            res = conv.back(simplified)
+            self.assertValid(EqualsOrIff(f, res), logic=QF_BV,
+                             solver_name="z3")
+
 
 if __name__ == '__main__':
     main()

{pysmt-0.9.7.dev423 → pysmt-0.9.7.dev431}/pysmt/test/test_regressions.py

@@ -574,6 +574,40 @@ class TestRegressions(TestCase):
                 s.add_assertion(f)
                 self.assertFalse(s.solve())
 
+    @skipIfSolverNotAvailable("msat")
+    def test_msat_all_sat_theory_atoms(self):
+        # Regression test: MathSAT5Solver.all_sat must accept arbitrary
+        # SMT-atoms as "important" terms, not only Boolean symbols.
+        # Previously the "important" terms were converted with a helper
+        # (_var2term) that assumed each term was a declared symbol, so
+        # passing a theory atom raised an AssertionError.
+        x = Symbol("x", INT)
+        f = And(LE(Int(0), x), LE(x, Int(5)))
+        atom = LE(x, Int(2))  # a theory atom, not a Boolean symbol
+
+        result = []
+
+        def callback(model, converter, res):
+            res.append(And(converter.back(v) for v in model))
+            return 1  # continue enumeration
+
+        with Solver(name="msat",
+                    solver_options={
+                        "dpll.allsat_minimize_model": "false",
+                        "dpll.allsat_allow_duplicates": "false",
+                        "preprocessor.toplevel_propagation": "false",
+                        "preprocessor.simplification": "0",
+                    }) as msat:
+            msat.add_assertion(f)
+            # This call used to raise AssertionError on a theory atom.
+            msat.all_sat([atom], lambda m: callback(m, msat.converter, result))
+
+        # The atom can be both true (x in [0,2]) and false (x in [3,5]),
+        # so we expect exactly the two disjoint total assignments.
+        self.assertEqual(len(result), 2, result)
+        self.assertIn(atom, result)
+        self.assertIn(Not(atom), result)
+
 
 if __name__ == "__main__":
     main()