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

pysmt/optimization/optimizer.py

@@ -16,6 +16,8 @@
 #   limitations under the License.
 #
 from fractions import Fraction
+
+from pysmt.constants import is_pysmt_integer, is_pysmt_fraction
 import warnings
 
 from pysmt.solvers.solver import Solver
@@ -371,8 +373,9 @@ class OptSearchInterval(OptComparationFunctions):
             model_value: Union[Fraction, int] = obj_value.bv_signed_value()
         else:
             v = obj_value.constant_value()
-            assert isinstance(v, (int, Fraction))
-            model_value = v
+            # backend-aware: v may be a gmpy2 mpz/mpq, not a python int/Fraction
+            assert is_pysmt_integer(v) or is_pysmt_fraction(v)
+            model_value = cast(Union[Fraction, int], v)
         if self._obj.is_minimization_goal():
             if self._upper is None or self._upper > model_value:
                 self._upper = model_value

pysmt/optimization/z3.py

@@ -18,7 +18,6 @@
 
 from __future__ import absolute_import
 
-from fractions import Fraction
 from warnings import warn
 
 from pysmt.decorators import clear_pending_pop
@@ -63,9 +62,10 @@ class Z3NativeOptimizer(Optimizer, Z3Solver):
             assert isinstance(goal, MaxSMTGoal)
             for soft, weight_exp in goal.soft:
                 obj_soft = self.converter.convert(soft)
-                w: Union[float, int, Fraction, str] = weight_exp.constant_value()
-                if isinstance(w, Fraction):
-                    w = float(w)
+                # str() yields an exact rational numeral ("1/3", "8") for every
+                # backend (int/Fraction and gmpy2 mpz/mpq); z3 add_soft parses it,
+                # avoiding the precision loss of float() on fractional weights.
+                w = str(weight_exp.constant_value())
                 h = self.z3.add_soft(obj_soft, w, "__pysmt_" + str(goal_id))
         else:
             term = goal.term()

{pysmt-0.9.7.dev461.dist-info → pysmt-0.9.7.dev464.dist-info}/METADATA

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

{pysmt-0.9.7.dev461.dist-info → pysmt-0.9.7.dev464.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pysmt/__init__.py,sha256=1SGEofFHRCjIIaHxwnnUVpx8VGc6I0LMZN90e5E-Pxs,1701
+pysmt/__init__.py,sha256=tdicdG-NykaNPElSNBSUVNz9TMOnVIJ9Ux9d-piT6JM,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
@@ -38,10 +38,10 @@ pysmt/cmd/installers/z3.py,sha256=5wP6O-a602-y1cuEyr22bkdWnOWHx8bIaPQ24xDtxX8,13
 pysmt/optimization/__init__.py,sha256=JXBHtcb4Lv-Sb8whc9JuGbRH2EBLWwtLUh3PL9HhNE8,650
 pysmt/optimization/goal.py,sha256=b6--z8gi-vyDjYSVNYIy9fiYhLXz51EPv5jxP64H_oI,10128
 pysmt/optimization/msat.py,sha256=yj5-vqxQFJnK3zjVlYpxemZ2BWG-6IrCTDKvjl94xNY,937
-pysmt/optimization/optimizer.py,sha256=eupiSExagPbLFnJMtTEOeLDOCpP-voEV_l9KzZvoIxg,29420
+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=qhSQ0wR487555yYW9vSvLaIMutKN05cczPPITK_O_u4,7270
+pysmt/optimization/z3.py,sha256=Y_yEP2TpaVVA4czNGUv6p7wFknMsX3CT4BnvdFaxZLQ,7376
 pysmt/smtlib/__init__.py,sha256=JXBHtcb4Lv-Sb8whc9JuGbRH2EBLWwtLUh3PL9HhNE8,650
 pysmt/smtlib/annotations.py,sha256=UTl_nnBikMGKzdpW5N17yIpvx-_8HZmo8hxXIKsm7Wo,4596
 pysmt/smtlib/commands.py,sha256=hwWnXrzZxJmKtkIitHRtuin01WDUErT0VERR9h45t2A,2277
@@ -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.dev461.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-pysmt-0.9.7.dev461.dist-info/licenses/NOTICE,sha256=Ns-Jsa6nbqZUiTEEAM6HqioSZIxQ2RCJzxoBlWQaUfc,601
-pysmt-0.9.7.dev461.dist-info/METADATA,sha256=Ec5wIiEr0YFjWydmtI3-BiX-bmpqOH4lmloOZ28ci_k,1774
-pysmt-0.9.7.dev461.dist-info/WHEEL,sha256=4YBfCYNH4wlLpv3pzq1hbEuIlXA4WJabKLFurZ7eTL0,109
-pysmt-0.9.7.dev461.dist-info/entry_points.txt,sha256=gDc1XM0xTJJMDGC_nXd0kfbX-Omjke9Dn9F3awMLYIU,57
-pysmt-0.9.7.dev461.dist-info/top_level.txt,sha256=NwHQbpTaZMEvjIUdC0bvvj-WUyULe-nt-opK3YQNRMk,6
-pysmt-0.9.7.dev461.dist-info/RECORD,,
+pysmt-0.9.7.dev464.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+pysmt-0.9.7.dev464.dist-info/licenses/NOTICE,sha256=Ns-Jsa6nbqZUiTEEAM6HqioSZIxQ2RCJzxoBlWQaUfc,601
+pysmt-0.9.7.dev464.dist-info/METADATA,sha256=hFb-E6tWMNml9h2lWP8v-Q0zhIjSxWWrFNONrjEIvWQ,1774
+pysmt-0.9.7.dev464.dist-info/WHEEL,sha256=4YBfCYNH4wlLpv3pzq1hbEuIlXA4WJabKLFurZ7eTL0,109
+pysmt-0.9.7.dev464.dist-info/entry_points.txt,sha256=gDc1XM0xTJJMDGC_nXd0kfbX-Omjke9Dn9F3awMLYIU,57
+pysmt-0.9.7.dev464.dist-info/top_level.txt,sha256=NwHQbpTaZMEvjIUdC0bvvj-WUyULe-nt-opK3YQNRMk,6
+pysmt-0.9.7.dev464.dist-info/RECORD,,