PySMT 0.9.7.dev441__py2.py3-none-any.whl → 0.9.7.dev446__py2.py3-none-any.whl

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", 446)
 
 # Try to provide human-readable version of latest commit for dev versions
 # E.g. v0.5.1-4-g49a49f2-wip

pysmt/cmd/install.py

@@ -42,7 +42,7 @@ INSTALLERS = [
     Installer(PicoSATInstaller, "965",
               {"pypicosat_minor_version" : "1708010052"}),
     Installer(CuddInstaller,    "2.0.3",
-              {"git_version" : "ecb03d6d231273343178f566cc4d7258dcce52b4"}),
+              {"git_version" : "0dabef26859b15710fd92e68e4eb6cf922a09de9"}),
     Installer(OptiMSatInstaller, "1.7.5", {})
 ]
 

pysmt/cmd/installers/bdd.py

@@ -39,16 +39,10 @@ class CuddInstaller(SolverInstaller):
         if self.architecture == "x86_64":
             makefile = "Makefile_64bit"
 
-        swig = "swig"
-        swig_version = SolverInstaller.run("swig -version", get_output=True)
-        if '4.0.1' in swig_version or '4.0.0' in swig_version:
-            print("WARNING: the BDD solver does not work with Swig4 < 4.0.2. Fallback to Swig3")
-            swig = "swig3.0" # This is the Ubuntu naming of the executable
-
         import sysconfig
         PYTHON_INCLUDE_DIR = sysconfig.get_path("include")
-        SolverInstaller.run("make -C %s -f %s PYTHON_INCL=-I%s SWIG=%s" %
-                            (self.extract_path, makefile, PYTHON_INCLUDE_DIR, swig))
+        SolverInstaller.run("make -C %s -f %s PYTHON_INCL=-I%s" %
+                            (self.extract_path, makefile, PYTHON_INCLUDE_DIR))
 
 
     def move(self):

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/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/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():

{pysmt-0.9.7.dev441.dist-info → pysmt-0.9.7.dev446.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PySMT
-Version: 0.9.7.dev441
+Version: 0.9.7.dev446
 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.dist-info → pysmt-0.9.7.dev446.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pysmt/__init__.py,sha256=bzDBwVwSeJw7m70-3aSG8aHqGsfCofwH6Oog-Tlodus,1701
+pysmt/__init__.py,sha256=5kJqOv_zBP-riTMt_fqKHt6vfxtVf0Y892c-MSYnt5Y,1701
 pysmt/__main__.py,sha256=rR-MV1QtLYqtVoJyY3m5B5Iz-lua0-5o6YSB0W4lKy8,1085
 pysmt/configuration.py,sha256=Iq_46QZ9z_jpBMk76euJWTqGEwHad2qyiEDPix5sXsA,4538
 pysmt/constants.py,sha256=pulb6NvROY_X8BePeyyX8T9MJLB79HZ_1FUYSlZ7Jfg,5769
@@ -22,11 +22,11 @@ pysmt/typing.py,sha256=aI8ZKEin4J2XLAHsY5fW1Pt4hZvlBlArxM4nrrmBas4,19550
 pysmt/utils.py,sha256=_dSgl45k-u9cMXSyR672GBJcKMKdtl6xSTjqXKTSfcs,2906
 pysmt/cmd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pysmt/cmd/check_version.py,sha256=DCS6pHVuQm9J_vfSSDDGxtvrV6P1mEhQK-IUjacDh3s,2895
-pysmt/cmd/install.py,sha256=dz04Oi5S_SGVoxA_Ozzb0VEn4y8hYZ5-zkd3paYmnNQ,10468
+pysmt/cmd/install.py,sha256=HK0I51_4Sjf_igi-v8dW7Q_-CVnAkvAKJsIpI6OQ9tI,10468
 pysmt/cmd/shell.py,sha256=1H5NJ9St879-U3EDizq_5l34vKPUJr-wi3MyBy164Sc,6594
 pysmt/cmd/installers/__init__.py,sha256=fEAD4FUh0Hjv7u-o9dc5nYMjzPUAzR8bWo8DSgUQjq4,1438
 pysmt/cmd/installers/base.py,sha256=agHbXV4ILfW2my8bjFLoRPmK9Jq8fPz9aESPGbPLu-g,13201
-pysmt/cmd/installers/bdd.py,sha256=Qq8YlYAVvxUqNXjoOlH9_Lhj4cj6WEt7HuhbSiF_L6k,2539
+pysmt/cmd/installers/bdd.py,sha256=IfTSdsFYhgefb0fapbwOeyNbjkrWzgBVH6M5NvOz4qM,2190
 pysmt/cmd/installers/btor.py,sha256=gUl_urKcWtbSYS_Vde_O7RJM0H-kRqh6hceTju-Sbcs,4995
 pysmt/cmd/installers/cvcfive.py,sha256=vWqAm5xF7IMY0JWEeyx3_ochCqyHx0dlcZBo9QcQ-uk,1460
 pysmt/cmd/installers/cvcfour.py,sha256=uBZkKIX4gZEMfjrhrparUSDydMcvGIGZM2Y8JYD0GzE,3916
@@ -55,7 +55,7 @@ pysmt/solvers/__init__.py,sha256=JXBHtcb4Lv-Sb8whc9JuGbRH2EBLWwtLUh3PL9HhNE8,650
 pysmt/solvers/bdd.py,sha256=tIW85N-iJbYUGCKucPhAsoXqo9G9bIcdBnCitzUmYTQ,15997
 pysmt/solvers/btor.py,sha256=nzT4ts-TJd7-WphU2UtpMuTkuK68D0UifYTHZyyr9gY,26053
 pysmt/solvers/cvcfive.py,sha256=M1CZ54u2i_-8lCXbE3-P1LmRfHu6vRDkE7OD6dJgoS4,25382
-pysmt/solvers/cvcfour.py,sha256=gv2vrFfkKxyTQu_BUlxyg9R5OnUYXbtVt1lNc21HYN0,24651
+pysmt/solvers/cvcfour.py,sha256=W8Afm8J7co87Vwt4L80kIoNaPcA3eBLwEnwAw5CcoHg,25798
 pysmt/solvers/dynmsat.py,sha256=bJokwHoxKWmQGqw9nQerRDb33d5c66Sa91jUYiZXwY0,2124
 pysmt/solvers/eager.py,sha256=E2wWhRVWe6sVxW2YOwPDhZ8O53uKNuPKwLIvsRsWFPA,3681
 pysmt/solvers/interpolation.py,sha256=6AO1wMkEKSkptuC4aXlNEO8Be1K2oW3W_er2XGc_aEA,2066
@@ -72,7 +72,7 @@ pysmt/test/__init__.py,sha256=LEFbVYw4X45sgEI4_ax55g-6G5Y7kj6CLaJr1TQr4ks,5750
 pysmt/test/examples.py,sha256=6yWa-hHEMJuo5GEbjWmzg509-LQxVAyr26lxGhcK_jU,40756
 pysmt/test/omt_examples.py,sha256=LdL43fLaHiR72Cng_2st4UaYf2ueoZgStcvhccy-RdI,10338
 pysmt/test/optimization_utils.py,sha256=zbj2bN-3uMaNexF7DSjuQAR0889IcMsCiE__tGtR6zM,15665
-pysmt/test/test_array.py,sha256=OypmqKf_ciigxK1X_W2b9sm0EWOA3wqH376QXt7oGCM,6237
+pysmt/test/test_array.py,sha256=-7R_L0d0MMuemdv0AtqNR2y8rX_w4Xc0NiaDKD4H_lY,7163
 pysmt/test/test_back.py,sha256=NnN0Wjva9Pj1ZJgUltBit_wcMIw4L_4c2fAJoT-WpvA,4536
 pysmt/test/test_bdd.py,sha256=CzOzP7CnTvhsg8KT5d8FPNSZ4uO9fI8deU1Xv8YUFIs,6194
 pysmt/test/test_bv.py,sha256=-pnOgslpMAeK9US4f_z4CU8LK0ZmDr-yceS1u1kwgps,12284
@@ -107,7 +107,7 @@ pysmt/test/test_rewritings.py,sha256=1eeseDwZyQD2VrOFBABXHTYJFJOXszP4olbCNeLcwfA
 pysmt/test/test_shannon_expansion.py,sha256=yaiZuB24wj1Zi-KdzRTmWuzAVaF9bQ603uto7zi6XBs,3082
 pysmt/test/test_simplify.py,sha256=ckQn_DUxVvGspaRNZmSPHkudhpUlG5K2w6C0wDqhL1w,7620
 pysmt/test/test_size.py,sha256=p3aqCMHfBiGLxvF0P8hE-PRQTT8VMPIJCjblq8Txh1w,3261
-pysmt/test/test_solving.py,sha256=n8-VE0QbxLDsr0tiMazYKYqkQkK-9P8Cag1D2wfJyJo,24952
+pysmt/test/test_solving.py,sha256=sB9Nz7pTg-MjInl3MKo4rCPDLwxti3Yp1QanwxLZ4As,25637
 pysmt/test/test_sorts.py,sha256=erfInyPH91WVB8JBUYLteTo5X5skKKP3vEXdUUKC-YE,6033
 pysmt/test/test_string.py,sha256=Y6VBfkLNKuePo8-HIzcwBH3eaYj0i-k1Y8tpFyw03zw,8096
 pysmt/test/test_typechecker.py,sha256=S2O8HjN_bLN6sz86TnsWqpRtxHk2VcVsGDoRZCcQnzE,7309
@@ -143,10 +143,10 @@ pysmt/walkers/dag.py,sha256=4CWSgoXm6nONhM-1znKRU4SBCb791OTS-M9QlQFhbs8,5751
 pysmt/walkers/generic.py,sha256=dmp47kJGtO6rhC2t07Mf_FsYN-lcy64LX-dZggNnWm4,5179
 pysmt/walkers/identitydag.py,sha256=EAxSneEW91Z8GphlkbMPsPdlac7_FDcVj-_6_aunU2s,10902
 pysmt/walkers/tree.py,sha256=8oyDSXZtUsCdExcrwG3hKuEgARHgdW6fvz0LZJwjp-k,2983
-pysmt-0.9.7.dev441.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-pysmt-0.9.7.dev441.dist-info/licenses/NOTICE,sha256=Ns-Jsa6nbqZUiTEEAM6HqioSZIxQ2RCJzxoBlWQaUfc,601
-pysmt-0.9.7.dev441.dist-info/METADATA,sha256=wk6mMVTRNTHWilVyD5oaVA76D_QmLxtuXyDNxAeYMPA,1774
-pysmt-0.9.7.dev441.dist-info/WHEEL,sha256=4YBfCYNH4wlLpv3pzq1hbEuIlXA4WJabKLFurZ7eTL0,109
-pysmt-0.9.7.dev441.dist-info/entry_points.txt,sha256=gDc1XM0xTJJMDGC_nXd0kfbX-Omjke9Dn9F3awMLYIU,57
-pysmt-0.9.7.dev441.dist-info/top_level.txt,sha256=NwHQbpTaZMEvjIUdC0bvvj-WUyULe-nt-opK3YQNRMk,6
-pysmt-0.9.7.dev441.dist-info/RECORD,,
+pysmt-0.9.7.dev446.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+pysmt-0.9.7.dev446.dist-info/licenses/NOTICE,sha256=Ns-Jsa6nbqZUiTEEAM6HqioSZIxQ2RCJzxoBlWQaUfc,601
+pysmt-0.9.7.dev446.dist-info/METADATA,sha256=MFt6QHqHsJb9VP0TrTS4mMiCmy5tPWEtn0Js7dCPf38,1774
+pysmt-0.9.7.dev446.dist-info/WHEEL,sha256=4YBfCYNH4wlLpv3pzq1hbEuIlXA4WJabKLFurZ7eTL0,109
+pysmt-0.9.7.dev446.dist-info/entry_points.txt,sha256=gDc1XM0xTJJMDGC_nXd0kfbX-Omjke9Dn9F3awMLYIU,57
+pysmt-0.9.7.dev446.dist-info/top_level.txt,sha256=NwHQbpTaZMEvjIUdC0bvvj-WUyULe-nt-opK3YQNRMk,6
+pysmt-0.9.7.dev446.dist-info/RECORD,,