python-sat 1.9.dev14__tar.gz → 1.9.dev15__tar.gz

{python_sat-1.9.dev14/python_sat.egg-info → python_sat-1.9.dev15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-sat
-Version: 1.9.dev14
+Version: 1.9.dev15
 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.dev14 → python_sat-1.9.dev15}/examples/hitman.py

@@ -476,24 +476,19 @@ class Hitman(object):
 
             if no_obj is False:
                 # a soft clause should be added for each new object
-                new_obj = filter(lambda vid: abs(vid) not in self.oracle.vmap.e2i, clause)
+                new_obj = sorted(set(abs(vid) for vid in clause if abs(vid) not in self.oracle.vmap.e2i))
         else:
             # this is a native AtMostK constraint
             clause = [list(map(lambda a: self.idpool.id(a.obj) * (2 * a.sign - 1), clause[0])), clause[1]]
 
             if no_obj is False:
                 # a soft clause should be added for each new object
-                new_obj = filter(lambda vid: abs(vid) not in self.oracle.vmap.e2i, clause[0])
-
-                # there may be duplicate literals if the constraint is weighted
-                new_obj = list(set(new_obj))
+                new_obj = sorted(set(abs(vid) for vid in clause[0] if abs(vid) not in self.oracle.vmap.e2i))
 
         # adding the hard clause
         self.oracle.add_clause(clause)
 
         if no_obj is False:
-            # some of the literals may also have the opposite polarity
-            new_obj = [l if l in self.idpool.obj2id else -l for l in new_obj]
 
             if self.htype != 'sat':
                 # new soft clauses

{python_sat-1.9.dev14 → python_sat-1.9.dev15}/examples/lsu.py

@@ -235,7 +235,7 @@ class LSU:
             self._assert_lt(self.cost)
 
         if is_sat:
-            self.model = filter(lambda l: abs(l) <= self.formula.nv, self.model)
+            self.model = list(filter(lambda l: abs(l) <= self.formula.nv, self.model))
             if self.verbose:
                 if self.found_optimum():
                     print('s OPTIMUM FOUND')

{python_sat-1.9.dev14 → python_sat-1.9.dev15}/pysat/__init__.py

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

{python_sat-1.9.dev14 → python_sat-1.9.dev15/python_sat.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-sat
-Version: 1.9.dev14
+Version: 1.9.dev15
 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.dev14 → python_sat-1.9.dev15}/python_sat.egg-info/SOURCES.txt

@@ -107,8 +107,10 @@ tests/test_encode_pb_conditional.py
 tests/test_equals1.py
 tests/test_formula_parsing.py
 tests/test_formula_unique.py
+tests/test_hitman.py
 tests/test_idpool.py
 tests/test_integer.py
+tests/test_lsu.py
 tests/test_oom.py
 tests/test_process.py
 tests/test_propagate.py

python_sat-1.9.dev15/tests/test_hitman.py

@@ -0,0 +1,31 @@
+from pysat.examples.hitman import Atom, Hitman
+
+
+def test_add_hard_registers_new_object_with_mcs_enumerators():
+    for htype in ('lbx', 'mcsls'):
+        with Hitman(bootstrap_with=[['first']], htype=htype) as hitman:
+            hitman.add_hard([Atom('second')])
+
+            assert sorted(hitman.get()) == ['first', 'second']
+
+
+def test_add_hard_registers_weighted_new_objects_with_rc2():
+    weights = {'base': 1, 'expensive': 10, 'cheap': 1}
+
+    with Hitman(bootstrap_with=[['base']], weights=weights,
+            htype='sorted') as hitman:
+        hitman.add_hard([Atom('expensive'), Atom('cheap')], weights=weights)
+
+        assert sorted(hitman.get()) == ['base', 'cheap']
+
+
+def test_add_hard_registers_new_objects_with_sat():
+    with Hitman(bootstrap_with=[['base']], htype='sat',
+            solver='mgh') as hitman:
+        hitman.add_hard([Atom('left'), Atom('right')])
+
+        result = hitman.get()
+
+        assert 'base' in result
+        assert len(set(result) & {'left', 'right'}) == 1
+        assert set(hitman.oracle.vmap.e2i) == {1, 2, 3}

python_sat-1.9.dev15/tests/test_lsu.py

@@ -0,0 +1,15 @@
+from pysat.examples.lsu import LSU
+from pysat.formula import WCNF
+
+
+def test_get_model_returns_reusable_list():
+    formula = WCNF()
+    formula.append([1], weight=1)
+
+    with LSU(formula, solver='g3') as lsu:
+        assert lsu.solve() is True
+
+        model = lsu.get_model()
+
+        assert isinstance(model, list)
+        assert lsu.get_model() == model