PySMT 0.9.7.dev477__py2.py3-none-any.whl → 0.9.7.dev479__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", 477)
+VERSION: Union[Tuple[int, int, int], Tuple[int, int, int, str, int]] = (0, 9, 7, "dev", 479)
 
 # Try to provide human-readable version of latest commit for dev versions
 # E.g. v0.5.1-4-g49a49f2-wip

pysmt/solvers/msat.py

@@ -232,6 +232,7 @@ class MathSAT5Solver(IncrementalTrackingSolver, UnsatCoreSolver, SmtLibBasicSolv
         self.intType = self._msat_lib.msat_get_integer_type(self.msat_env())
         self.boolType = self._msat_lib.msat_get_bool_type(self.msat_env())
         self.mgr = environment.formula_manager
+        self._assumption_keys: Dict[FNode, FNode] = {}
 
     @clear_pending_pop
     def _reset_assertions(self):
@@ -269,7 +270,9 @@ class MathSAT5Solver(IncrementalTrackingSolver, UnsatCoreSolver, SmtLibBasicSolv
 
     def _named_assertions_map(self):
         if self.options.unsat_cores_mode == "named":
-            return dict((t[0], (t[1],t[2])) for t in self.assertions)
+            # not self.assertions: popping the assumptions level would
+            # invalidate the unsat core in MathSAT (dangling terms, segfault)
+            return dict((t[0], (t[1],t[2])) for t in self._assertion_stack)
         return None
 
     @clear_pending_pop
@@ -277,6 +280,8 @@ class MathSAT5Solver(IncrementalTrackingSolver, UnsatCoreSolver, SmtLibBasicSolv
         res = None
         bool_ass = []
         other_ass = []
+        # maps the fresh literal standing for each non-literal assumption to it
+        self._assumption_keys = {}
         for x in assumptions if assumptions is not None else []:
             if x.is_literal():
                 bool_ass.append(self.converter.convert(x))
@@ -284,8 +289,14 @@ class MathSAT5Solver(IncrementalTrackingSolver, UnsatCoreSolver, SmtLibBasicSolv
                 other_ass.append(x)
         if len(other_ass) > 0:
             self.push()
-            # this introduces new named assertions if named unsat cores.
-            self.add_assertion(self.mgr.And(other_ass))
+            for x in other_ass:
+                key = self.mgr.FreshSymbol(template="_assumption_%d")
+                self._assumption_keys[key] = x
+                term = self.converter.convert(self.mgr.Implies(key, x))
+                if self._msat_lib.msat_assert_formula(self.msat_env(), term) != 0:
+                    raise InternalSolverError(
+                        self._msat_lib.msat_last_error_message(self.msat_env()))
+                bool_ass.append(self.converter.convert(key))
 
         n_ass = self._named_assertions()
         if n_ass is not None and len(n_ass) > 0:
@@ -319,6 +330,9 @@ class MathSAT5Solver(IncrementalTrackingSolver, UnsatCoreSolver, SmtLibBasicSolv
                 raise InternalSolverError(
                     self._msat_lib.msat_last_error_message(self.msat_env()))
             res = set(self.converter.back(t) for t in terms)
+            # drop the Implies(key, x) encoding of non-literal assumptions
+            res = set(f for f in res
+                      if not f.get_free_variables() & self._assumption_keys.keys())
             return res | self._unsat_assumptions()
         else:
             return set(self.get_named_unsat_core().values()) | \
@@ -334,7 +348,7 @@ class MathSAT5Solver(IncrementalTrackingSolver, UnsatCoreSolver, SmtLibBasicSolv
         if n_ass_map is not None:
             # in named mode the named assertions are passed as assumptions too
             res -= set(n_ass_map)
-        return res
+        return set(self._assumption_keys.get(f, f) for f in res)
 
     def get_named_unsat_core(self):
         """After a call to solve() yielding UNSAT, returns the unsat core as a

pysmt/solvers/z3.py

@@ -177,6 +177,7 @@ class Z3Solver(IncrementalTrackingSolver, UnsatCoreSolver, SmtLibBasicSolver):
         self.mgr = environment.formula_manager
 
         self._name_cnt = 0
+        self._assumption_keys: Dict[FNode, FNode] = {}
         return
 
     @clear_pending_pop
@@ -218,9 +219,15 @@ class Z3Solver(IncrementalTrackingSolver, UnsatCoreSolver, SmtLibBasicSolver):
                 else:
                     other_ass.append(x)
 
+            # maps the fresh literal standing for each non-literal assumption to it
+            self._assumption_keys = {}
             if len(other_ass) > 0:
                 self.push()
-                self.add_assertion(self.mgr.And(other_ass))
+                for x in other_ass:
+                    key = self.mgr.FreshSymbol(template="_assumption_%d")
+                    self._assumption_keys[key] = x
+                    self.z3.add(self.converter.convert(self.mgr.Implies(key, x)))
+                    bool_ass.append(self.converter.convert(key))
                 self.pending_pop = True
             res = self.z3.check(*bool_ass)
         else:
@@ -240,7 +247,8 @@ class Z3Solver(IncrementalTrackingSolver, UnsatCoreSolver, SmtLibBasicSolver):
 
     def _named_assertions_map(self):
         if self.options.unsat_cores_mode is not None:
-            return dict((t[0], (t[1],t[2])) for t in self.assertions)
+            # not self.assertions: that would pop the assumptions level
+            return dict((t[0], (t[1],t[2])) for t in self._assertion_stack)
         return None
 
     def get_named_unsat_core(self):
@@ -279,7 +287,7 @@ class Z3Solver(IncrementalTrackingSolver, UnsatCoreSolver, SmtLibBasicSolver):
                     cnt += 1
                 res[name] = formula
             else:
-                core_assumptions.add(key)
+                core_assumptions.add(self._assumption_keys.get(key, key))
         return res, core_assumptions
 
     @clear_pending_pop

pysmt/test/test_unsat_cores.py

@@ -18,7 +18,7 @@
 from pysmt.test import (TestCase, skipIfSolverNotAvailable,
                         skipIfNoUnsatCoreSolverForLogic, main)
 from pysmt.shortcuts import (get_unsat_core, And, Or, Not, Symbol, UnsatCoreSolver,
-                             Solver, is_unsat, Int, GT, get_env)
+                             Solver, is_unsat, Int, GT, GE, LE, get_env)
 from pysmt.typing import INT
 from pysmt.logics import QF_BOOL, QF_BV, QF_LIA
 from pysmt.exceptions import (SolverStatusError, SolverReturnedUnknownResultError,
@@ -214,6 +214,25 @@ class TestUnsatCores(TestCase):
                                          {"n1": Or(x, y)}, name)
 
 
+    @skipIfNoUnsatCoreSolverForLogic(QF_LIA)
+    def test_non_literal_assumptions_in_unsat_core(self):
+        a = Symbol("a", INT)
+        pos, neg = GE(a, Int(1)), LE(a, Int(0))
+        for name in get_env().factory.all_unsat_core_solvers(logic=QF_LIA):
+            for mode in ["all", "named"]:
+                with UnsatCoreSolver(name=name, logic=QF_LIA,
+                                     unsat_cores_mode=mode) as s:
+                    s.add_assertion(pos, named="pos")
+                    self.assertFalse(s.solve([neg]))
+                    # twice: reading the core must not pop the assumptions level
+                    for _ in range(2):
+                        self.assertEqual(s.get_unsat_core(), {pos, neg},
+                                         (name, mode))
+                        if mode == "named":
+                            self.assertEqual(s.get_named_unsat_core(),
+                                             {"pos": pos}, (name, mode))
+
+
     @skipIfNoUnsatCoreSolverForLogic(QF_BOOL)
     def test_assumptions_as_iterator(self):
         x, y = Symbol("x"), Symbol("y")

{pysmt-0.9.7.dev477.dist-info → pysmt-0.9.7.dev479.dist-info}/METADATA

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

{pysmt-0.9.7.dev477.dist-info → pysmt-0.9.7.dev479.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pysmt/__init__.py,sha256=D4wKbKbyKykOKhdJR9zJPcu0mML4q9kKVXFpLzvfvxc,1701
+pysmt/__init__.py,sha256=Rk5gkV-z7QbJ0x3NiUHhVZwx_DyiljPnCYz_md5zi6Y,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
@@ -59,7 +59,7 @@ pysmt/solvers/cvcfour.py,sha256=W8Afm8J7co87Vwt4L80kIoNaPcA3eBLwEnwAw5CcoHg,2579
 pysmt/solvers/dynmsat.py,sha256=bJokwHoxKWmQGqw9nQerRDb33d5c66Sa91jUYiZXwY0,2124
 pysmt/solvers/eager.py,sha256=E2wWhRVWe6sVxW2YOwPDhZ8O53uKNuPKwLIvsRsWFPA,3681
 pysmt/solvers/interpolation.py,sha256=6AO1wMkEKSkptuC4aXlNEO8Be1K2oW3W_er2XGc_aEA,2066
-pysmt/solvers/msat.py,sha256=jWnPOlwkTfWqLc3vxy50nfEqLEWI1JTUCcaTBmmaQss,64511
+pysmt/solvers/msat.py,sha256=FOxqzFcrY_PrjordGk5Y9GDj53x3_lFN7H1DdEXrIGw,65442
 pysmt/solvers/options.py,sha256=7iFnYXs4XYc7h2u3s0umL-gnEARNLRg_SN_jsxZXZQ8,4518
 pysmt/solvers/pico.py,sha256=y31QT7ZQVMeKjXc7g4DZrpc1LTzbhCLyE0zyOLd-BsE,10680
 pysmt/solvers/portfolio.py,sha256=GFKR2S8FoANzZJWUkYVqWEJG7sw04RYgSnwaKJNWuUs,10092
@@ -67,7 +67,7 @@ pysmt/solvers/qelim.py,sha256=iEQ9PE9IPFA6dxqSMHFp3aIyDCTiZyIlSAduh0txrAg,5451
 pysmt/solvers/smtlib.py,sha256=daJkKBtTMHLIoQt77dhT8Qh8P6eFBO9mF4C6tialtBc,9924
 pysmt/solvers/solver.py,sha256=d49iRy3I1Vk0--_0DirjUyalM8MdH6-ymcrPU6a5RZw,22046
 pysmt/solvers/yices.py,sha256=uG08Q9iqctXk-2rDP6H5OO88FE_ml83K0k5j8irpbcg,25910
-pysmt/solvers/z3.py,sha256=hiCfZfJzsmludprQamHCaeb4SSPDVaL1oyuAH9UNU8s,45417
+pysmt/solvers/z3.py,sha256=pTtGBtZcAFM4377G07zt6I7a4j6NclfStG_XkeuXr-Y,45953
 pysmt/test/__init__.py,sha256=LEFbVYw4X45sgEI4_ax55g-6G5Y7kj6CLaJr1TQr4ks,5750
 pysmt/test/examples.py,sha256=fogqgP2qEpvaOswVFYRr4Q8o6TKoCLPW9460SL9HVvo,40756
 pysmt/test/omt_examples.py,sha256=LdL43fLaHiR72Cng_2st4UaYf2ueoZgStcvhccy-RdI,10338
@@ -111,7 +111,7 @@ pysmt/test/test_solving.py,sha256=pf5ZitNQrVAT2VSn-ZstHNromomL6OxPKBJMdyZzdLk,25
 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
-pysmt/test/test_unsat_cores.py,sha256=AOkwSD8m8aOL6yWGd-NQqFSVDpAkWhep-dBJCus29NY,8331
+pysmt/test/test_unsat_cores.py,sha256=rWORETwkEkLdaYaPLy4hBCUVcsIlYDFAR1Ajc3QeG0w,9310
 pysmt/test/test_walker_ext.py,sha256=j7mp46QoD3f-TD4zdqHM2EF40zBCizpV3t7z2f0_CeY,3595
 pysmt/test/test_walkers.py,sha256=EuudGwgGErl5np7Enf8g-RTWLqE3oyzbAvhKo5hx4KU,10284
 pysmt/test/configs/config1.ini,sha256=MAXPN6VVW-S7jpWmglMPN5a3JYgorTqKAF6cmfohMpo,224
@@ -143,10 +143,10 @@ pysmt/walkers/dag.py,sha256=hw9qUfadQTpihX685YQobfxKv9XA84ffiA8XRMUQEfU,5694
 pysmt/walkers/generic.py,sha256=2oMr_MDr7FswSlyx2ulbJ9ke5FsTCKABURnCsMeg4fc,5093
 pysmt/walkers/identitydag.py,sha256=EAxSneEW91Z8GphlkbMPsPdlac7_FDcVj-_6_aunU2s,10902
 pysmt/walkers/tree.py,sha256=1vquhaChRMSG_pvbz16wqKOFnsQAkzLvjh_xbB3dg5c,2730
-pysmt-0.9.7.dev477.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-pysmt-0.9.7.dev477.dist-info/licenses/NOTICE,sha256=Ns-Jsa6nbqZUiTEEAM6HqioSZIxQ2RCJzxoBlWQaUfc,601
-pysmt-0.9.7.dev477.dist-info/METADATA,sha256=tdxWAclomTF5eGcgBisQL5Q0BhBBG3B9Sbjd_jSQmK0,1774
-pysmt-0.9.7.dev477.dist-info/WHEEL,sha256=4YBfCYNH4wlLpv3pzq1hbEuIlXA4WJabKLFurZ7eTL0,109
-pysmt-0.9.7.dev477.dist-info/entry_points.txt,sha256=gDc1XM0xTJJMDGC_nXd0kfbX-Omjke9Dn9F3awMLYIU,57
-pysmt-0.9.7.dev477.dist-info/top_level.txt,sha256=NwHQbpTaZMEvjIUdC0bvvj-WUyULe-nt-opK3YQNRMk,6
-pysmt-0.9.7.dev477.dist-info/RECORD,,
+pysmt-0.9.7.dev479.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+pysmt-0.9.7.dev479.dist-info/licenses/NOTICE,sha256=Ns-Jsa6nbqZUiTEEAM6HqioSZIxQ2RCJzxoBlWQaUfc,601
+pysmt-0.9.7.dev479.dist-info/METADATA,sha256=Oe-wVWCyM2uqvMIi8kJLWGPiWv6Cp5DuTx2u_8zcp5Y,1774
+pysmt-0.9.7.dev479.dist-info/WHEEL,sha256=4YBfCYNH4wlLpv3pzq1hbEuIlXA4WJabKLFurZ7eTL0,109
+pysmt-0.9.7.dev479.dist-info/entry_points.txt,sha256=gDc1XM0xTJJMDGC_nXd0kfbX-Omjke9Dn9F3awMLYIU,57
+pysmt-0.9.7.dev479.dist-info/top_level.txt,sha256=NwHQbpTaZMEvjIUdC0bvvj-WUyULe-nt-opK3YQNRMk,6
+pysmt-0.9.7.dev479.dist-info/RECORD,,