python-sat 1.9.dev9__tar.gz → 1.9.dev11__tar.gz

{python_sat-1.9.dev9/python_sat.egg-info → python_sat-1.9.dev11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-sat
-Version: 1.9.dev9
+Version: 1.9.dev11
 Summary: A Python library for prototyping with SAT oracles
 Home-page: https://github.com/pysathq/pysat
 Author: Alexey Ignatiev, Joao Marques-Silva, Antonio Morgado

{python_sat-1.9.dev9 → python_sat-1.9.dev11}/pysat/__init__.py

@@ -10,7 +10,7 @@
 
 # current version
 #==============================================================================
-VERSION = (1, 9, 'dev', 9)
+VERSION = (1, 9, 'dev', 11)
 
 
 # PEP440 Format

{python_sat-1.9.dev9 → python_sat-1.9.dev11}/pysat/formula.py

@@ -972,7 +972,7 @@ class Formula(object):
                 return ('identity', type(obj), id(obj))
             return ('obj', type(obj), obj)
 
-        def _formula_key(form):
+        def _formula_key_uncached(form):
             """
                 Get a structural key without a formula's merge flag.
             """
@@ -1001,6 +1001,21 @@ class Formula(object):
             counts = collections.Counter(_formula_key(subform) for subform in form.subformulas)
             return (form.type, frozenset(counts.items()))
 
+        def _formula_key(form):
+            """
+                Get a cached structural key for an immutable formula.
+            """
+
+            if isinstance(form, Formula):
+                key = getattr(form, '_key_cache', None)
+                if key is None:
+                    key = _formula_key_uncached(form)
+                    form._key_cache = key
+
+                return key
+
+            return _formula_key_uncached(form)
+
         def _merged_operands(operands, formula_type):
             """Flatten same-type operands for a merged connective."""
             result = []

{python_sat-1.9.dev9 → python_sat-1.9.dev11/python_sat.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-sat
-Version: 1.9.dev9
+Version: 1.9.dev11
 Summary: A Python library for prototyping with SAT oracles
 Home-page: https://github.com/pysathq/pysat
 Author: Alexey Ignatiev, Joao Marques-Silva, Antonio Morgado

{python_sat-1.9.dev9 → python_sat-1.9.dev11}/tests/test_clausification.py

@@ -33,9 +33,10 @@ def test_clausification():
                                                                          [1, 5, -6], [6, -1, 5], [6, 1, -5], [6], [7]])
 
     # multiple successive inner/outermost clausification
+    Formula.cleanup()
     f = And(Atom('1'), Atom('2'))
     compare(list(f), [[1], [2]])
 
     # nested conjunctions are inherited directly by the outer conjunction
     g = And(f, Atom('3'))
-    compare(list(g), [[1], [2], [4]])
+    compare(list(g), [[1], [2], [3]])