PySMT 0.9.7.dev346__tar.gz → 0.9.7.dev356__tar.gz

{pysmt-0.9.7.dev346/PySMT.egg-info → pysmt-0.9.7.dev356}/PKG-INFO

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

{pysmt-0.9.7.dev346 → pysmt-0.9.7.dev356/PySMT.egg-info}/PKG-INFO

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

{pysmt-0.9.7.dev346 → pysmt-0.9.7.dev356}/pysmt/__init__.py

@@ -16,7 +16,7 @@
 #   limitations under the License.
 #
 
-VERSION = (0, 9, 7, "dev", 346)
+VERSION = (0, 9, 7, "dev", 356)
 
 # Try to provide human-readable version of latest commit for dev versions
 # E.g. v0.5.1-4-g49a49f2-wip

{pysmt-0.9.7.dev346 → pysmt-0.9.7.dev356}/pysmt/solvers/cvcfive.py

@@ -25,7 +25,7 @@ except ImportError:
 from cvc5 import Kind
 
 import pysmt.typing as types
-from pysmt.logics import PYSMT_LOGICS, ARRAYS_CONST_LOGICS
+from pysmt.logics import PYSMT_LOGICS, AUFLIRA, AUFLIA, AUFNIRA, ALIA
 
 from pysmt.solvers.solver import Solver, Converter, SolverOptions
 from pysmt.exceptions import (SolverReturnedUnknownResultError,
@@ -92,8 +92,14 @@ class CVC5Options(SolverOptions):
 
 class CVC5Solver(Solver, SmtLibBasicSolver, SmtLibIgnoreMixin):
 
-    LOGICS = PYSMT_LOGICS -\
-             ARRAYS_CONST_LOGICS
+    # Exclude const-array logics that mix BV with integer/real arithmetic:
+    # cvc5 rejects arrays indexed by array types (e.g. QF_AUFBVLIRA*).
+    LOGICS = (PYSMT_LOGICS | {AUFLIRA, AUFLIA, AUFNIRA, ALIA}) - \
+             frozenset(l for l in PYSMT_LOGICS
+                       if l.theory.arrays_const
+                       and l.theory.bit_vectors
+                       and (l.theory.integer_arithmetic
+                            or l.theory.real_arithmetic))
 
     OptionsClass = CVC5Options
 
@@ -105,6 +111,9 @@ class CVC5Solver(Solver, SmtLibBasicSolver, SmtLibIgnoreMixin):
         self.cvc5_solver = cvc5.Solver()
         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","")
@@ -114,6 +123,15 @@ class CVC5Solver(Solver, SmtLibBasicSolver, SmtLibIgnoreMixin):
             self.logic_name = "LRA"
         self.cvc5_solver.setLogic(self.logic_name)
 
+        # Enable constant-array support (STORE_ALL / mkConstArray).
+        # Without this, cvc5 rejects assertions containing constant
+        # arrays with "Cannot handle assertion with term of kind
+        # STORE_ALL in this configuration."
+        try:
+            self.cvc5_solver.setOption("arrays-exp", "true")
+        except Exception:
+            pass  # older cvc5 versions may not have this option
+
         self.options(self)
 
         self.converter = CVC5Converter(environment, parent_solver=self)
@@ -257,6 +275,11 @@ class CVC5Converter(Converter, DagWalker):
             array_type = self._cvc5_type_to_type(expr.getSort())
             base_value = self.back(const_)
             res = self.mgr.Array(array_type.index_type, base_value)
+        elif expr.getKind() == Kind.STORE:
+            base = self.back(expr[0])
+            index = self.back(expr[1])
+            value = self.back(expr[2])
+            res = self.mgr.Store(base, index, value)
         else:
             raise PysmtTypeError("Unsupported expression:", str(expr))
 
@@ -335,6 +358,16 @@ class CVC5Converter(Converter, DagWalker):
     def walk_array_select(self, formula, args, **kwargs):
         return self.cvc5_solver.mkTerm(Kind.SELECT, args[0], args[1])
 
+    def walk_array_value(self, formula, args, **kwargs):
+        arr_sort = self._type_to_cvc5(formula.get_type())
+        # args[0] is the converted default value
+        const_arr = self.cvc5_solver.mkConstArray(arr_sort, args[0])
+        # Remaining args are (index, value) pairs for point overrides
+        result = const_arr
+        for i in range(1, len(args), 2):
+            result = self.cvc5_solver.mkTerm(Kind.STORE, result, args[i], args[i + 1])
+        return result
+
     def walk_minus(self, formula, args, **kwargs):
         return self.cvc5_solver.mkTerm(Kind.SUB, args[0], args[1])
 

{pysmt-0.9.7.dev346 → pysmt-0.9.7.dev356}/pysmt/solvers/z3.py

@@ -45,7 +45,8 @@ from pysmt.exceptions import (SolverReturnedUnknownResultError,
                               UndefinedSymbolError, PysmtValueError,
                               PysmtInfinityError, PysmtInfinitesimalError)
 from pysmt.decorators import clear_pending_pop, catch_conversion_error
-from pysmt.logics import LRA, LIA, QF_UFLRA, QF_UFLIA, PYSMT_LOGICS
+from pysmt.logics import LRA, LIA, QF_UFLRA, QF_UFLIA, PYSMT_LOGICS, \
+    AUFLIRA, AUFLIA, AUFNIRA, ALIA
 from pysmt.oracles import get_logic
 from pysmt.constants import Fraction, Numeral, is_pysmt_integer
 
@@ -141,7 +142,9 @@ class Z3Options(SolverOptions):
 class Z3Solver(IncrementalTrackingSolver, UnsatCoreSolver,
                SmtLibBasicSolver, SmtLibIgnoreMixin):
 
-    LOGICS = PYSMT_LOGICS - set(x for x in PYSMT_LOGICS if x.theory.strings)
+    LOGICS = (PYSMT_LOGICS |
+              {AUFLIRA, AUFLIA, AUFNIRA, ALIA}) -\
+             set(x for x in PYSMT_LOGICS if x.theory.strings)
     OptionsClass = Z3Options
 
     SOLVERFOR_LOGIC_NAMES=['AUFLIA', 'ALIA', 'AUFLIRA', 'AUFNIRA', 'LRA', 'LIA', 'NIA',

{pysmt-0.9.7.dev346 → pysmt-0.9.7.dev356}/pysmt/test/test_cnf.py

@@ -18,7 +18,7 @@
 import os
 import pytest
 
-from pysmt.shortcuts import Implies, is_sat, reset_env, Symbol, Iff, Select, ArrayType, INT, BOOL, And, get_env
+from pysmt.shortcuts import Implies, is_sat, is_valid, reset_env, Symbol, Iff, Select, ArrayType, INT, BOOL, And, get_env
 from pysmt.rewritings import CNFizer
 from pysmt.logics import QF_BOOL, QF_LRA, QF_LIA, QF_UFLIRA, QF_UFLRA, QF_ALIA
 from pysmt.test import TestCase, skipIfNoSolverForLogic, main
@@ -61,9 +61,9 @@ class TestCnf(TestCase):
     @skipIfNoSolverForLogic(QF_LIA)
     def test_smtlib_cnf_small(self):
         cnt = 0
-        max_cnt = 3
+        max_cnt = 2
         for (logic, f, expected_result) in SMTLIB_TEST_FILES:
-            if logic != QF_LIA:
+            if logic != QF_LRA:
                 continue
             self._smtlib_cnf(f, logic, expected_result)
             cnt += 1
@@ -91,7 +91,7 @@ class TestCnf(TestCase):
             return
 
         cnf = conv.convert_as_formula(expr)
-        self.assertValid(Implies(cnf, expr), logic=logic)
+        self.assertTrue(is_valid(Implies(cnf, expr), logic=logic))
 
         res = is_sat(cnf, logic=logic)
         self.assertEqual(res, res_is_sat)

{pysmt-0.9.7.dev346 → pysmt-0.9.7.dev356}/pysmt/test/test_logics.py

@@ -114,9 +114,6 @@ class TestLogic(TestCase):
             with self.assertRaises(NoSolverAvailableError):
                 Solver(logic=pysmt.logics.QF_BOOL)
 
-        with self.assertRaises(NoSolverAvailableError):
-            Solver(logic=NRA)
-
         with self.assertRaises(NoSolverAvailableError):
             Solver(name='picosat', logic=pysmt.logics.QF_BV)