python-sat 1.9.dev12__tar.gz → 1.9.dev13__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of python-sat might be problematic. Click here for more details.
- {python_sat-1.9.dev12/python_sat.egg-info → python_sat-1.9.dev13}/PKG-INFO +1 -1
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/pysat/__init__.py +1 -1
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/pysat/formula.py +4 -2
- {python_sat-1.9.dev12 → python_sat-1.9.dev13/python_sat.egg-info}/PKG-INFO +1 -1
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/tests/test_clausification.py +12 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/LICENSE.txt +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/MANIFEST.in +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/README.rst +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/allies/__init__.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/allies/approxmc.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/allies/unigen.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/cardenc/bitwise.hh +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/cardenc/card.hh +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/cardenc/clset.hh +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/cardenc/common.hh +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/cardenc/itot.hh +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/cardenc/ladder.hh +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/cardenc/mto.hh +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/cardenc/pairwise.hh +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/cardenc/ptypes.hh +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/cardenc/pycard.cc +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/cardenc/seqcounter.hh +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/cardenc/sortcard.hh +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/cardenc/utils.hh +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/examples/__init__.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/examples/bbscan.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/examples/bica.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/examples/fm.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/examples/genhard.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/examples/hitman.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/examples/lbx.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/examples/lsu.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/examples/mcsls.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/examples/models.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/examples/musx.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/examples/optux.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/examples/primer.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/examples/rc2.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/examples/usage.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/formula/pf_parse.cc +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/formula/pf_plus.cc +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/formula/pf_plus.hh +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/formula/pf_py.hh +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/formula/pf_scan.hh +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/formula/pf_weight.cc +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/formula/pf_weight.hh +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/formula/pyformula.cc +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/formula/pyformula.hh +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/pysat/_fileio.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/pysat/_utils.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/pysat/card.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/pysat/engines.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/pysat/integer.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/pysat/pb.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/pysat/process.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/pysat/solvers.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/python_sat.egg-info/SOURCES.txt +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/python_sat.egg-info/dependency_links.txt +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/python_sat.egg-info/requires.txt +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/python_sat.egg-info/top_level.txt +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/requirements.txt +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/setup.cfg +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/setup.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/solvers/cadical103.tar.gz +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/solvers/cadical153.tar.gz +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/solvers/cadical195.tar.gz +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/solvers/cadical300.tar.gz +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/solvers/glucose30.tar.gz +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/solvers/glucose41.tar.gz +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/solvers/glucose421.tar.gz +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/solvers/lingeling.tar.gz +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/solvers/maplechrono.zip +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/solvers/maplecm.zip +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/solvers/maplesat.zip +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/solvers/mergesat3.tar.gz +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/solvers/minicard.tar.gz +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/solvers/minisat22.tar.gz +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/solvers/minisatgh.zip +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/solvers/patches/cadical103.patch +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/solvers/patches/cadical153.patch +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/solvers/patches/cadical195.patch +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/solvers/patches/cadical300.patch +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/solvers/patches/glucose30.patch +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/solvers/patches/glucose41.patch +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/solvers/patches/glucose421.patch +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/solvers/patches/gluecard30.patch +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/solvers/patches/gluecard41.patch +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/solvers/patches/kissat404.patch +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/solvers/patches/lingeling.patch +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/solvers/patches/maplechrono.patch +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/solvers/patches/maplecm.patch +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/solvers/patches/maplesat.patch +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/solvers/patches/mergesat3.patch +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/solvers/patches/minicard.patch +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/solvers/patches/minisat22.patch +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/solvers/patches/minisatep.patch +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/solvers/patches/minisatgh.patch +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/solvers/prepare.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/solvers/pysolvers.cc +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/tests/test_accum_stats.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/tests/test_atmost.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/tests/test_atmost1.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/tests/test_atmostk.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/tests/test_boolengine.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/tests/test_cnf.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/tests/test_empty_extclause.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/tests/test_encode_pb_conditional.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/tests/test_equals1.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/tests/test_formula_parsing.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/tests/test_formula_unique.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/tests/test_idpool.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/tests/test_integer.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/tests/test_oom.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/tests/test_process.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/tests/test_propagate.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/tests/test_unique_model.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/tests/test_unique_mus.py +0 -0
- {python_sat-1.9.dev12 → python_sat-1.9.dev13}/tests/test_warmstart.py +0 -0
|
@@ -2994,8 +2994,10 @@ class XOr(Formula):
|
|
|
2994
2994
|
f2 = Formula._vpool[Formula._context].obj(n2)
|
|
2995
2995
|
final = XOr(f1, f2)
|
|
2996
2996
|
|
|
2997
|
-
|
|
2998
|
-
|
|
2997
|
+
# the new name will be shared between the n-ary XOr and the
|
|
2998
|
+
# final binary XOr
|
|
2999
|
+
self.name = Formula._vpool[Formula._context].id(self)
|
|
3000
|
+
final.name = self.name
|
|
2999
3001
|
else:
|
|
3000
3002
|
self.name = Formula._vpool[Formula._context].id(self)
|
|
3001
3003
|
final = None
|
|
@@ -45,3 +45,15 @@ def test_clausification():
|
|
|
45
45
|
Formula.cleanup()
|
|
46
46
|
h = And(CNF(from_clauses=[[1, 2], [-1, 3]]), Atom('4'))
|
|
47
47
|
compare(list(h), [[1, 2], [-1, 3], [4]])
|
|
48
|
+
|
|
49
|
+
|
|
50
|
+
def test_nary_xor_name_is_registered():
|
|
51
|
+
Formula.cleanup()
|
|
52
|
+
x, y, z = Atom('x'), Atom('y'), Atom('z')
|
|
53
|
+
xor = XOr(x, y, z)
|
|
54
|
+
formula = And(xor, Atom('w'))
|
|
55
|
+
formula.clausify()
|
|
56
|
+
|
|
57
|
+
vpool = Formula.export_vpool()
|
|
58
|
+
assert vpool.id(xor) == xor.name
|
|
59
|
+
assert vpool.obj(xor.name) is xor
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|