PySMT 0.9.7.dev461__tar.gz → 0.9.7.dev464__tar.gz

{pysmt-0.9.7.dev461/PySMT.egg-info → pysmt-0.9.7.dev464}/PKG-INFO

@@ -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 → pysmt-0.9.7.dev464/PySMT.egg-info}/PKG-INFO

@@ -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 → pysmt-0.9.7.dev464}/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-0.9.7.dev461 → pysmt-0.9.7.dev464}/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-0.9.7.dev461 → pysmt-0.9.7.dev464}/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()