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

pysmt/cmd/install.py

@@ -36,7 +36,7 @@ INSTALLERS = [
     Installer(CVC5Installer,    "1.3.3", {}),
     Installer(CVC4Installer,    "1.7-prerelease",
               {"git_version" : "391ab9df6c3fd9a3771864900c1718534c1e4666"}),
-    Installer(Z3Installer,      "4.15.0", {}),
+    Installer(Z3Installer,      "5.1.0", {}),
     Installer(YicesInstaller,   "2.6.4", {"yices_api_version": "1.1.5"}),
     Installer(BtorInstaller,    "3.2.3", {}),
     Installer(PicoSATInstaller, "965",

pysmt/optimization/z3.py

@@ -18,8 +18,6 @@
 
 from __future__ import absolute_import
 
-from warnings import warn
-
 from pysmt.decorators import clear_pending_pop
 from pysmt.solvers.solver import Model
 from pysmt.solvers.z3 import Z3Solver, Z3Model
@@ -127,33 +125,31 @@ class Z3NativeOptimizer(Optimizer, Z3Solver):
 
     @clear_pending_pop
     def boxed_optimize(self, goals: Sequence[Goal]) -> Optional[Dict[Goal, Tuple[Model, FNode]]]:
-        # This implementation is a naive simulation of a box optimization,
-        # but is needed to cope with an upstream Z3 issue:
-        # https://github.com/Z3Prover/z3/issues/7240
-        #
-        # A properer implementation would be as follows.
-        # '''python
-        # self.z3.set(priority='box')
-        # models = {}
-        # for goal_id, goal in enumerate(goals):
-        #     self._assert_z3_goal(goal, goal_id)
-        # for goal in goals:
-        #     if self.z3.check() == z3.sat:
-        #         model = Z3Model(self.environment, self.z3.model())
-        #         models[goal] = (model, model.get_value(goal.term()))
-        #     else:
-        #         return None
-        # return models
-        # '''
-        warn("Boxed optimization is not working in Z3 (see https://github.com/Z3Prover/z3/issues/7240). "
-             "PySMT will simulate the correct behavior, but the performance will be sub-optimal")
-        models = {}
-        for g in goals:
-            r = self.optimize(g)
-            if r is None:
-                return None
-            models[g] = r
-        return models
+        self.push()
+        try:
+            self.z3.set(priority='box')
+            handles = [self._assert_z3_goal(goal, goal_id)
+                       for goal_id, goal in enumerate(goals)]
+            # In box mode, each call to check() yields the optimal model
+            # of the next objective, in the order they were asserted
+            models: Dict[Goal, Tuple[Model, FNode]] = {}
+            for goal, h in zip(goals, handles):
+                if self.z3.check() != z3.sat:
+                    return None
+                try:
+                    model = Z3Model(self.environment, self.z3.model())
+                    if goal.is_maxsmt_goal():
+                        models[goal] = (model, self._compute_max_smt_cost(model, goal))
+                    else:
+                        self.converter.back(self.z3.lower(h))
+                        models[goal] = (model, model.get_value(goal.term()))
+                except PysmtInfinityError:
+                    raise PysmtUnboundedOptimizationError("The optimal value is unbounded")
+                except PysmtInfinitesimalError:
+                    raise PysmtInfinitesimalError("The optimal value is infinitesimal")
+            return models
+        finally:
+            self.pop()
 
     @clear_pending_pop
     def lexicographic_optimize(self, goals: Sequence[Goal]) -> Optional[Tuple[Model, List[FNode]]]:

pysmt/test/test_doc_snippets.py

@@ -0,0 +1,75 @@
+#
+# This file is part of pySMT.
+#
+#   Copyright 2014 Andrea Micheli and Marco Gario
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+import os
+import runpy
+import unittest
+
+from pysmt.test import (TestCase, skipIfSolverNotAvailable,
+                        skipIfNoSolverForLogic,
+                        skipIfNoUnsatCoreSolverForLogic, main)
+from pysmt.logics import QF_LIA
+
+
+SNIPPETS_DIR = os.path.join(os.path.dirname(__file__),
+                            "..", "..", "docs", "code_snippets")
+
+
+# The docs are not shipped with the package, so skip when run from an install.
+@unittest.skipIf(not os.path.isdir(SNIPPETS_DIR), "docs/ not available")
+class TestDocSnippets(TestCase):
+
+    def setUp(self):
+        super().setUp()
+        # Match the default environment a reader gets from pysmt.shortcuts.
+        self.env.enable_infix_notation = True
+
+    def run_snippets(self, *names):
+        for name in names:
+            with self.subTest(snippet=name):
+                runpy.run_path(os.path.join(SNIPPETS_DIR, name + ".py"),
+                               run_name="__main__")
+
+    def test_no_solver(self):
+        self.run_snippets("hello_world_opening", "hello_world_infix")
+
+    @skipIfNoSolverForLogic(QF_LIA)
+    def test_qf_lia(self):
+        self.run_snippets("hello_world_is_sat", "hello_world_get_model",
+                          "hello_world_qf_lia")
+
+    @skipIfSolverNotAvailable("z3")
+    def test_z3(self):
+        self.run_snippets("hello_world")
+
+    @skipIfNoUnsatCoreSolverForLogic(QF_LIA)
+    def test_unsat_cores(self):
+        self.run_snippets("unsat_core", "unsat_core_named",
+                          "unsat_core_assumptions")
+
+    def test_all_snippets_are_tested(self):
+        tested = {"hello_world_opening", "hello_world_infix",
+                  "hello_world_is_sat", "hello_world_get_model",
+                  "hello_world_qf_lia", "hello_world", "unsat_core",
+                  "unsat_core_named", "unsat_core_assumptions"}
+        found = {f[:-3] for f in os.listdir(SNIPPETS_DIR) if f.endswith(".py")}
+        self.assertEqual(found, tested,
+                         "Add new docs/code_snippets files to this test")
+
+
+if __name__ == '__main__':
+    main()

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

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

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

@@ -1,4 +1,4 @@
-pysmt/__init__.py,sha256=Rk5gkV-z7QbJ0x3NiUHhVZwx_DyiljPnCYz_md5zi6Y,1701
+pysmt/__init__.py,sha256=-1nhsqf1cDJwZGajwhlm8vA59g3l6eLyADmCUslgp7k,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,7 +22,7 @@ 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=HK0I51_4Sjf_igi-v8dW7Q_-CVnAkvAKJsIpI6OQ9tI,10468
+pysmt/cmd/install.py,sha256=-PT8N0nbl9fkd0LLQ1LMdHy1szzsGVimGdmuogH3xcc,10467
 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
@@ -41,7 +41,7 @@ pysmt/optimization/msat.py,sha256=yj5-vqxQFJnK3zjVlYpxemZ2BWG-6IrCTDKvjl94xNY,93
 pysmt/optimization/optimizer.py,sha256=nt7x9YCULbS5wVg2IPWV6ZKnZGRQjDk5yGPYiz7QdmY,29607
 pysmt/optimization/optimsat.py,sha256=hRqhPcssuUzXnTeEEv8taFcRI5nE7gU8drwDIC0NtFk,11040
 pysmt/optimization/yices.py,sha256=Ly48G5JpnOhJBkd25Vg21jGcCjLEeEQUrWsG2Xxl_KI,931
-pysmt/optimization/z3.py,sha256=Y_yEP2TpaVVA4czNGUv6p7wFknMsX3CT4BnvdFaxZLQ,7376
+pysmt/optimization/z3.py,sha256=oruI7J_4NmtmiinGcyzooKE-Ny61Tf-sMxjc4kSoTEI,7479
 pysmt/smtlib/__init__.py,sha256=JXBHtcb4Lv-Sb8whc9JuGbRH2EBLWwtLUh3PL9HhNE8,650
 pysmt/smtlib/annotations.py,sha256=UTl_nnBikMGKzdpW5N17yIpvx-_8HZmo8hxXIKsm7Wo,4596
 pysmt/smtlib/commands.py,sha256=hwWnXrzZxJmKtkIitHRtuin01WDUErT0VERR9h45t2A,2277
@@ -81,6 +81,7 @@ pysmt/test/test_cnf.py,sha256=iDb5OJeKxE7xP9molEa3TFtDtan8eAUF5gtDZMFZJn4,4620
 pysmt/test/test_configuration.py,sha256=qlY1K2ap4BMoPmbANg2y3391ndr7EophNd_UZNAOUko,3661
 pysmt/test/test_constants.py,sha256=vdjjtAOw5oQg57Bl5tllslnVWBHuRq3Zk33F1xDsBtA,4664
 pysmt/test/test_cvc_quantifiers.py,sha256=a40NDyPKNynVpqq9M5pDTR8qFL_EumR8whw8escxP4I,1850
+pysmt/test/test_doc_snippets.py,sha256=y3dXAduT6PNyT_XQOczwKIV5ymeGzqj3JxCTfQmi0sI,2720
 pysmt/test/test_dwf.py,sha256=_spseUblkyG0w2ttthUvm_gab2PqnjqCsnRHlH1Q2aE,5015
 pysmt/test/test_eager_model.py,sha256=hF9V8wQYXVeyW2Bo4sACa98xeJtfOMYjMvjWMHQaGag,3662
 pysmt/test/test_env.py,sha256=g98aqMU2dlPW2hQmWy8DxCLfm06upMic5mU91MGX_PQ,8758
@@ -143,10 +144,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.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,,
+pysmt-0.9.7.dev485.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+pysmt-0.9.7.dev485.dist-info/licenses/NOTICE,sha256=Ns-Jsa6nbqZUiTEEAM6HqioSZIxQ2RCJzxoBlWQaUfc,601
+pysmt-0.9.7.dev485.dist-info/METADATA,sha256=oY0W4dADbjmGgO9xwljRC_pXSAXQq1KmOeH4xAjXQk4,1774
+pysmt-0.9.7.dev485.dist-info/WHEEL,sha256=4YBfCYNH4wlLpv3pzq1hbEuIlXA4WJabKLFurZ7eTL0,109
+pysmt-0.9.7.dev485.dist-info/entry_points.txt,sha256=gDc1XM0xTJJMDGC_nXd0kfbX-Omjke9Dn9F3awMLYIU,57
+pysmt-0.9.7.dev485.dist-info/top_level.txt,sha256=NwHQbpTaZMEvjIUdC0bvvj-WUyULe-nt-opK3YQNRMk,6
+pysmt-0.9.7.dev485.dist-info/RECORD,,