PySMT 0.9.7.dev408__tar.gz → 0.9.7.dev414__tar.gz

{pysmt-0.9.7.dev408/PySMT.egg-info → pysmt-0.9.7.dev414}/PKG-INFO

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

{pysmt-0.9.7.dev408 → pysmt-0.9.7.dev414/PySMT.egg-info}/PKG-INFO

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

{pysmt-0.9.7.dev408 → pysmt-0.9.7.dev414}/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", 408)
+VERSION: Union[Tuple[int, int, int], Tuple[int, int, int, str, int]] = (0, 9, 7, "dev", 414)
 
 # Try to provide human-readable version of latest commit for dev versions
 # E.g. v0.5.1-4-g49a49f2-wip

{pysmt-0.9.7.dev408 → pysmt-0.9.7.dev414}/pysmt/substituter.py

@@ -151,7 +151,8 @@ class Substituter(pysmt.walkers.IdentityDagWalker):
             # 2. We apply the substitution on the quantifier body with
             #    the new 'reduced' map
             sub = self.__class__(self.env)
-            res_formula = sub.substitute(formula.arg(0), new_subs)
+            res_formula = sub.substitute(formula.arg(0), subs=new_subs,
+                                         interpretations=kwargs.get('interpretations', None))
 
             # 3. We invoke the relevant function (walk_exists or
             #    walk_forall) to compute the substitution
@@ -304,8 +305,9 @@ class MSSubstituter(Substituter):
     def __init__(self, env):
         Substituter.__init__(self, env=env)
 
-    def substitute(self, formula, subs):
-        return Substituter.substitute(self, formula, subs)
+    def substitute(self, formula, subs=None, interpretations=None):
+        return Substituter.substitute(self, formula, subs,
+                                      interpretations=interpretations)
 
     def _substitute(self, formula, substitutions):
         """Returns the substitution for formula, if one is defined, otherwise

{pysmt-0.9.7.dev408 → pysmt-0.9.7.dev414}/pysmt/test/test_walkers.py

@@ -26,7 +26,7 @@ from pysmt.test import TestCase, main
 from pysmt.formula import FormulaManager
 from pysmt.test.examples import get_example_formulae
 from pysmt.exceptions import UnsupportedOperatorError, PysmtTypeError
-from pysmt.substituter import MSSubstituter, MGSubstituter
+from pysmt.substituter import FunctionInterpretation, MSSubstituter, MGSubstituter
 
 
 class TestWalkers(TestCase):
@@ -78,6 +78,21 @@ class TestWalkers(TestCase):
         with self.assertRaisesRegex(PysmtTypeError, "substitute()"):
             substitute(f, {x:x})
 
+    def test_substituter_interpretations_in_quantifiers(self):
+        x = Symbol("x", INT)
+        UF_XOR = Symbol('uf_xor', FunctionType(INT, [INT, INT]))
+        f = ForAll([x], Equals(Function(UF_XOR, [x, x]), Int(0)))
+
+        class XORInterpreter(FunctionInterpretation):
+            def __init__(self): pass
+            def interpret(self, env, args):
+                if args[0] == args[1]: return Int(0)
+                return Function(UF_XOR, args)
+        
+        subs = f.substitute({}, interpretations={UF_XOR: XORInterpreter()})
+
+        self.assertEqual(subs, ForAll([x], Equals(Int(0), Int(0))))
+
     def test_undefined_node(self):
         varA = Symbol("At", INT)