PySMT 0.9.6.dev34__tar.gz → 0.9.6.dev40__tar.gz

{PySMT-0.9.6.dev34/PySMT.egg-info → PySMT-0.9.6.dev40}/PKG-INFO

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

{PySMT-0.9.6.dev34 → PySMT-0.9.6.dev40/PySMT.egg-info}/PKG-INFO

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

{PySMT-0.9.6.dev34 → PySMT-0.9.6.dev40}/pysmt/__init__.py

@@ -16,7 +16,7 @@
 #   limitations under the License.
 #
 
-VERSION = (0, 9, 6, "dev", 34)
+VERSION = (0, 9, 6, "dev", 40)
 
 # Try to provide human-readable version of latest commit for dev versions
 # E.g. v0.5.1-4-g49a49f2-wip

{PySMT-0.9.6.dev34 → PySMT-0.9.6.dev40}/pysmt/formula.py

@@ -780,7 +780,7 @@ class FormulaManager(object):
                                 payload=(left.bv_width(),))
 
     def BVURem(self, left, right):
-        """Returns the reminder of the two BV."""
+        """Returns the remainder of the two BV."""
         return self.create_node(node_type=op.BV_UREM,
                                 args=(left, right),
                                 payload=(left.bv_width(),))

{PySMT-0.9.6.dev34 → PySMT-0.9.6.dev40}/pysmt/logics.py

@@ -480,6 +480,14 @@ variables.""",
                quantifier_free=True,
                real_arithmetic=True)
 
+QF_LIRA = Logic(name="QF_LIRA",
+                description=\
+"""Unquantified linear integer and real arithmetic""",
+                integer_arithmetic=True,
+                real_arithmetic=True,
+                linear=True,
+                quantifier_free=True)
+
 QF_NIA = Logic(name="QF_NIA",
                description=\
 """Quantifier-free integer arithmetic.""",
@@ -667,7 +675,7 @@ QF_LOGICS = frozenset(_l for _l in LOGICS if _l.quantifier_free)
 # This is the set of logics supported by the current version of pySMT
 #
 PYSMT_LOGICS = frozenset([QF_BOOL, QF_IDL, QF_LIA, QF_LRA, QF_RDL, QF_UF, QF_UFIDL,
-                          QF_UFLIA, QF_UFLRA, QF_UFLIRA,
+                          QF_UFLIA, QF_UFLRA, QF_UFLIRA, QF_LIRA,
                           BOOL, LRA, LIA, UFLIRA, UFLRA,
                           QF_BV, QF_UFBV,
                           QF_SLIA,
@@ -795,10 +803,17 @@ def get_closer_logic(supported_logics, logic):
     does not support the given logic.
 
     """
-    res = [l for l in supported_logics if logic <= l]
-    if len(res) == 0:
+    candidates = [l for l in supported_logics if logic <= l]
+    if len(candidates) == 0:
         raise NoLogicAvailableError("Logic %s is not supported" % logic)
-    return min(res)
+
+    # We remove from the candidates, the logics that subsume another candidate
+    # (i.e. that are more general) because we are looking for the closer logic
+    res = [l for l in candidates if not any(l != k and k <= l for k in candidates)]
+
+    # There might be multiple incomparable logics that are closer, we
+    # deterministically select the one having a lexicographically smaller name
+    return sorted(res, key=lambda x:str(x))[0]
 
 
 def get_closer_pysmt_logic(target_logic):

{PySMT-0.9.6.dev34 → PySMT-0.9.6.dev40}/pysmt/test/test_logics.py

@@ -16,9 +16,9 @@
 #   limitations under the License.
 #
 import pysmt.logics
-from pysmt.logics import get_logic_by_name, get_logic, most_generic_logic
+from pysmt.logics import get_closer_logic, get_logic_by_name, get_logic, most_generic_logic
 from pysmt.logics import PYSMT_LOGICS
-from pysmt.logics import QF_LIA, LIA, UFLIRA, LRA, QF_UFLIRA, QF_BV, NRA, QF_IDL, QF_BOOL
+from pysmt.logics import QF_LIA, LIA, UFLIRA, LRA, QF_UFLIRA, QF_BV, NRA, QF_IDL, QF_BOOL, QF_NIRA, QF_LIRA
 from pysmt.logics import Theory
 from pysmt.exceptions import (UndefinedLogicError, NoSolverAvailableError,
                               NoLogicAvailableError)
@@ -142,5 +142,10 @@ class TestLogic(TestCase):
                    integer_arithmetic=True)
         self.assertIsNotNone(t)
 
+    def test_get_closer_logic_is_deterministic(self):
+        l1 = get_closer_logic([QF_UFLIRA, QF_NIRA], QF_LIRA)
+        l2 = get_closer_logic([QF_NIRA, QF_UFLIRA], QF_LIRA)
+        self.assertEqual(l1, l2)
+
 if __name__ == "__main__":
     main()