PySMT 0.9.7.dev441__tar.gz → 0.9.7.dev444__tar.gz

{pysmt-0.9.7.dev441/PySMT.egg-info → pysmt-0.9.7.dev444}/PKG-INFO

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

{pysmt-0.9.7.dev441 → pysmt-0.9.7.dev444/PySMT.egg-info}/PKG-INFO

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

{pysmt-0.9.7.dev441 → pysmt-0.9.7.dev444}/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", 441)
+VERSION: Union[Tuple[int, int, int], Tuple[int, int, int, str, int]] = (0, 9, 7, "dev", 444)
 
 # Try to provide human-readable version of latest commit for dev versions
 # E.g. v0.5.1-4-g49a49f2-wip

{pysmt-0.9.7.dev441 → pysmt-0.9.7.dev444}/pysmt/solvers/cvcfour.py

@@ -25,7 +25,7 @@ except ImportError:
     raise SolverAPINotFound
 
 import pysmt.typing as types
-from pysmt.logics import PYSMT_LOGICS, ARRAYS_CONST_LOGICS
+from pysmt.logics import PYSMT_LOGICS
 
 from pysmt.solvers.solver import Solver, Converter, SolverOptions
 from pysmt.exceptions import (SolverReturnedUnknownResultError,
@@ -77,7 +77,6 @@ class CVC4Options(SolverOptions):
 class CVC4Solver(SmtLibBasicSolver):
 
     LOGICS = PYSMT_LOGICS -\
-             ARRAYS_CONST_LOGICS -\
              set(l for l in PYSMT_LOGICS if not l.theory.linear)
 
     OptionsClass = CVC4Options
@@ -92,6 +91,9 @@ class CVC4Solver(SmtLibBasicSolver):
         self.cvc4 = None
         self.declarations = None
         self.logic_name = str(logic)
+        if self.logic_name.endswith("*"):
+            # Const-array extension (pySMT-internal suffix)
+            self.logic_name = self.logic_name[:-1]
         if "t" in self.logic_name:
             # Custom Type extension
             self.logic_name = self.logic_name.replace("t","")
@@ -247,11 +249,7 @@ class CVC4Converter(Converter, DagWalker):
                 v = expr.getConstString()
                 res = self.mgr.String(v.toString())
             elif expr.getType().isArray():
-                const_ = expr.getConstArrayStoreAll()
-                array_type = self._cvc4_type_to_type(const_.getType())
-                base_value = self.back(const_.getExpr())
-                res = self.mgr.Array(array_type.index_type,
-                                     base_value)
+                res = self._back_array(expr)
             else:
                 raise PysmtTypeError("Unsupported constant type:",
                                      expr.getType().toString())
@@ -260,6 +258,26 @@ class CVC4Converter(Converter, DagWalker):
 
         return res
 
+    def _back_array(self, expr):
+        """Converts a CVC4 array value into a pySMT Array.
+
+        CVC4 represents an array value as a (possibly empty) sequence of
+        STOREs on top of a STORE_ALL node, which holds the default value.
+        """
+        assert expr.getType().isArray(), "Expecting a CVC4 array"
+        stores = []
+        while expr.getNumChildren() == 3:
+            # STORE(array, index, value)
+            array, index, value = expr.getChildren()
+            stores.append((self.back(index), self.back(value)))
+            expr = array
+        const_ = expr.getConstArrayStoreAll()
+        array_type = self._cvc4_type_to_type(const_.getType())
+        res = self.mgr.Array(array_type.index_type, self.back(const_.getExpr()))
+        for index, value in reversed(stores):
+            res = self.mgr.Store(res, index, value)
+        return res
+
     @catch_conversion_error
     def convert(self, formula):
         return self.walk(formula)
@@ -334,6 +352,15 @@ class CVC4Converter(Converter, DagWalker):
     def walk_array_select(self, formula, args, **kwargs):
         return self.mkExpr(CVC4.SELECT, args[0], args[1])
 
+    def walk_array_value(self, formula, args, **kwargs):
+        arr_type = self.env.stc.get_type(formula)
+        rval = self.mkConst(CVC4.ArrayStoreAll(self._type_to_cvc4(arr_type),
+                                               args[0]))
+        # The remaining args are (index, value) pairs
+        for i in range(1, len(args), 2):
+            rval = self.mkExpr(CVC4.STORE, rval, args[i], args[i+1])
+        return rval
+
     def walk_minus(self, formula, args, **kwargs):
         return self.mkExpr(CVC4.MINUS, args[0], args[1])
 

{pysmt-0.9.7.dev441 → pysmt-0.9.7.dev444}/pysmt/test/test_array.py

@@ -18,14 +18,17 @@
 
 from pysmt.test import TestCase, main
 from pysmt.test import skipIfNoSolverForLogic, skipIfSolverNotAvailable
-from pysmt.logics import QF_AUFLIA, QF_AUFBV
+from pysmt.logics import QF_AUFLIA, QF_AUFBV, get_logic_by_name
 from pysmt.typing import ARRAY_INT_INT, ArrayType, INT, REAL, BV8, BOOL
-from pysmt.shortcuts import (Solver,
+from pysmt.shortcuts import (Solver, get_env, simplify,
                              Symbol, Not, Equals, Int, BV, Real, FreshSymbol,
                              Select, Store, Array, TRUE)
 from pysmt.exceptions import ConvertExpressionError, PysmtTypeError, PysmtValueError
 
 
+QF_ALIA_CONST = get_logic_by_name("QF_ALIA*")
+
+
 class TestArray(TestCase):
 
     def test_array_type(self):
@@ -92,6 +95,22 @@ class TestArray(TestCase):
         formula = Equals(Array(BV8, TRUE()), FreshSymbol(ArrayType(BV8, BOOL)))
         self.assertSat(formula, logic=QF_AUFBV, solver_name="btor")
 
+    @skipIfNoSolverForLogic(QF_ALIA_CONST)
+    def test_const_array_model(self):
+        """Constant arrays round-trip through every solver supporting them."""
+        a = Symbol("a", ARRAY_INT_INT)
+        value = Store(Store(Array(INT, Int(0)), Int(1), Int(5)), Int(2), Int(7))
+        formula = Equals(a, value)
+        for name in get_env().factory.all_solvers(logic=QF_ALIA_CONST):
+            with Solver(name=name, logic=QF_ALIA_CONST) as s:
+                s.add_assertion(formula)
+                self.assertTrue(s.solve(), name)
+                model = s.get_value(a)
+                for idx, expected in [(Int(1), Int(5)), (Int(2), Int(7)),
+                                      (Int(42), Int(0))]:
+                    self.assertEqual(simplify(Select(model, idx)), expected,
+                                     (name, model))
+
     def test_complex_types(self):
         with self.assertRaises(PysmtTypeError):
             # Not(Store(Array<Real,BV8>(8d_0), 1.0, 8d_5) =

{pysmt-0.9.7.dev441 → pysmt-0.9.7.dev444}/pysmt/test/test_solving.py

@@ -209,7 +209,6 @@ class TestBasic(TestCase):
     @skipIfSolverNotAvailable("cvc5")
     def test_examples_cvc(self):
         for (f, validity, satisfiability, logic) in get_example_formulae():
-            if logic.theory.arrays_const: continue
             try:
                 v = is_valid(f, solver_name='cvc5', logic=logic)
                 s = is_sat(f, solver_name='cvc5', logic=logic)
@@ -222,6 +221,22 @@ class TestBasic(TestCase):
                 # Logic is not supported by CVC
                 pass
 
+    @skipIfSolverNotAvailable("cvc4")
+    def test_examples_cvc4(self):
+        for (f, validity, satisfiability, logic) in get_example_formulae():
+            if not logic.theory.linear: continue
+            try:
+                v = is_valid(f, solver_name='cvc4', logic=logic)
+                s = is_sat(f, solver_name='cvc4', logic=logic)
+                self.assertEqual(validity, v, f)
+                self.assertEqual(satisfiability, s, f)
+            except SolverReturnedUnknownResultError:
+                # CVC does not handle quantifiers in a complete way
+                self.assertFalse(logic.quantifier_free)
+            except NoSolverAvailableError:
+                # Logic is not supported by CVC
+                pass
+
     @skipIfSolverNotAvailable("yices")
     def test_examples_yices(self):
         for (f, validity, satisfiability, logic) in get_example_formulae():