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

{python_sat-1.9.dev13/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.dev13
+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.dev13 → python_sat-1.9.dev15}/examples/bica.py

@@ -231,6 +231,7 @@ class Bica:
         :param ominz: do heuristic core reduction
         :param onodisj: do not enumerate disjoint MCSes with OptUx
         :param opuresat: use pure SAT-based hitting set enumeration
+        :param oreduce: minimize correction sets with this budget on the conflict count
         :param ounsorted: apply unsorted MUS enumeration
         :param otrim: do core trimming at most this number of times
         :param weighted: get a minimal cover wrt. the total number of literals
@@ -255,6 +256,7 @@ class Bica:
         :type ominz: bool
         :type onodisj: bool
         :type opuresat: str
+        :type oreduce: int
         :type ounsorted: bool
         :type otrim: int
         :type weighted: bool
@@ -265,8 +267,8 @@ class Bica:
                  padapt=False, pdcalls=False, pexhaust=False, pminz=False,
                  ppuresat=False, psearch='lin', punsorted=False, ptrim=False,
                  osolver='mgh', oadapt=False, odcalls=False, oexhaust=False,
-                 ominz=False, onodisj=False, opuresat=False, ounsorted=False,
-                 otrim=False, weighted=False, verbose=0):
+                 ominz=False, onodisj=False, opuresat=False, oreduce=0,
+                 ounsorted=False, otrim=False, weighted=False, verbose=0):
         """
             Initialiser.
         """
@@ -297,6 +299,7 @@ class Bica:
         self.ominz = ominz
         self.onodisj = onodisj
         self.opuresat = opuresat
+        self.oreduce = oreduce
         self.ounsorted = ounsorted
         self.otrim = otrim
 
@@ -425,8 +428,9 @@ class Bica:
                                adapt=self.oadapt, cover=None,
                                dcalls=self.odcalls, exhaust=self.oexhaust,
                                minz=self.ominz, nodisj=self.onodisj,
-                               puresat=self.opuresat, unsorted=self.ounsorted,
-                               trim=self.otrim, verbose=self.verbose)
+                               puresat=self.opuresat, reduce=self.oreduce,
+                               unsorted=self.ounsorted, trim=self.otrim,
+                               verbose=self.verbose)
 
         return self.optux.compute()
 
@@ -510,12 +514,13 @@ def parse_options():
         opts, args = getopt.getopt(sys.argv[1:],
                                    'aAdDe:hmMnp:P:r:R:s:S:t:T:uUvwxX',
                                    ['padapt', 'oadapt', 'pdcalls', 'odcalls',
-                                    'enum=', 'help', 'pminimize', 'ominimize',
-                                    'no-disj', 'ppuresat=', 'opuresat=',
-                                    'reduce=', 'repr=', 'psolver=',
-                                    'osolver=', 'ptrim=', 'otrim=',
-                                    'punsorted', 'ounsorted', 'verbose',
-                                    'weighted', 'pexhaust', 'oexhaust'])
+                                    'enum=', 'help', 'mincs=', 'pminimize',
+                                    'ominimize', 'no-disj', 'ppuresat=',
+                                    'opuresat=', 'reduce=', 'repr=',
+                                    'psolver=', 'osolver=', 'ptrim=',
+                                    'otrim=', 'punsorted', 'ounsorted',
+                                    'verbose', 'weighted', 'pexhaust',
+                                    'oexhaust'])
     except getopt.GetoptError as err:
         sys.stderr.write(str(err).capitalize())
         usage()
@@ -540,6 +545,7 @@ def parse_options():
     osolver = 'mgh'
     ppuresat = False
     opuresat = False
+    oreduce = 0
     punsorted = False
     ounsorted = False
     ptrim = 0
@@ -561,6 +567,8 @@ def parse_options():
         elif opt in ('-h', '--help'):
             usage()
             sys.exit(0)
+        elif opt == '--mincs':
+            oreduce = int(arg)
         elif opt in ('-m', '--pminimize'):
             pminz = True
         elif opt in ('-M', '--ominimize'):
@@ -601,8 +609,8 @@ def parse_options():
 
     return to_enum, mode, padapt, oadapt, pdcalls, odcalls, pexhaust, \
             oexhaust, pminz, ominz, nodisj, ptrim, otrim, search, psolver, \
-            osolver, ppuresat, opuresat, punsorted, ounsorted, verbose, \
-            weighted, args
+            osolver, ppuresat, opuresat, oreduce, punsorted, ounsorted, \
+            verbose, weighted, args
 
 
 #
@@ -621,6 +629,8 @@ def usage():
     print('        -e, --enum=<int>           Enumerate this many "top-k" solutions')
     print('                                   Available values: [1 .. INT_MAX], all (default = 1)')
     print('        -h, --help                 Print this help message')
+    print('        --mincs=<int>              Budget on conflicts number when applying heuristic correction set minimization [OptUx]')
+    print('                                   Available values: [0 .. INT_MAX], -1 (default = 0, meaning no minimization)')
     print('        -m, --pminimize            Use a heuristic unsatisfiable core minimizer [Primer]')
     print('        -M, --ominimize            Use a heuristic unsatisfiable core minimizer [OptUx]')
     print('        -n, --no-disj              Do not enumerate disjoint MCSes [OptUx]')
@@ -656,8 +666,8 @@ if __name__ == '__main__':
     # parse command-line options
     to_enum, mode, padapt, oadapt, pdcalls, odcalls, pexhaust, oexhaust, \
             pminz, ominz, nodisj, ptrim, otrim, search, psolver, osolver, \
-            ppuresat, opuresat, punsorted, ounsorted, verbose, weighted, \
-            files = parse_options()
+            ppuresat, opuresat, oreduce, punsorted, ounsorted, verbose, \
+            weighted, files = parse_options()
 
     if files:
         # read CNF from file
@@ -671,8 +681,8 @@ if __name__ == '__main__':
                   punsorted=punsorted, ptrim=ptrim, osolver=osolver,
                   oadapt=oadapt, odcalls=odcalls, oexhaust=oexhaust,
                   ominz=ominz, onodisj=nodisj, opuresat=opuresat,
-                  ounsorted=ounsorted, otrim=otrim, weighted=weighted,
-                  verbose=verbose) as bica:
+                  oreduce=oreduce, ounsorted=ounsorted, otrim=otrim,
+                  weighted=weighted, verbose=verbose) as bica:
 
             for i, minf in enumerate(bica.enumerate()):
                 if verbose > 1:

{python_sat-1.9.dev13 → 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.dev13 → 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.dev13 → python_sat-1.9.dev15}/examples/optux.py

@@ -174,6 +174,16 @@ class OptUx(object):
         whose integer value signifies the number of processing rounds to be
         applied. The number of rounds is set to 0 by default.
 
+        Since the algorithm builds on implicit hitting set dualization,
+        correction sets computed along the way can be minimized
+        *heuristically*, by limiting the budget on the number of conflicts a
+        SAT solver can collect during the minimization process. Parameter
+        ``reduce`` is responsible for this behaviour. By default, the budget
+        is set to ``0``, meaning that no reduction of correction sets is
+        performed. Setting it to ``-1`` forces the solver to compute an exact
+        MCS. Otherwise, any positive value of this parameter will indicate the
+        upper bound on the number of conflicts.
+
         Finally, one more optional input parameter ``cover`` is to be used
         when exhaustive enumeration of MUSes is not necessary and the tool can
         stop as soon as a given formula is covered by the set of currently
@@ -206,6 +216,7 @@ class OptUx(object):
         :param nodisj: do not enumerate disjoint MCSes
         :param process: apply formula preprocessing this many times
         :param puresat: use pure SAT-based hitting set enumeration
+        :param reduce: minimize correction sets using this budget on the number of conflicts
         :param unsorted: apply unsorted MUS enumeration
         :param trim: do core trimming at most this number of times
         :param verbose: verbosity level
@@ -220,6 +231,7 @@ class OptUx(object):
         :type nodisj: bool
         :type process: int
         :type puresat: str
+        :type reduce: int
         :type unsorted: bool
         :type trim: int
         :type verbose: int
@@ -227,7 +239,7 @@ class OptUx(object):
 
     def __init__(self, formula, solver='g3', adapt=False, cover=None,
             dcalls=False, exhaust=False, minz=False, nodisj=False, process=0,
-            puresat=False, unsorted=False, trim=False, verbose=0):
+            puresat=False, reduce=0, unsorted=False, trim=False, verbose=0):
         """
             Constructor.
         """
@@ -237,6 +249,9 @@ class OptUx(object):
         # verbosity level
         self.verbose = verbose
 
+        # budget on the number of conflicts when reducing corrections sets
+        self.reduce_budget = reduce
+
         # constructing a local copy of the formula
         self.formula = WCNFPlus()
         self.formula.hard = formula.hard[:]
@@ -497,9 +512,12 @@ class OptUx(object):
         # correctly computed cost of the unit-mcs component
         units_cost = sum(map(lambda l: self.weights[l], self.units))
 
+        it = 0
         while True:
             # computing a new optimal hitting set
             hs = self.hitman.get()
+            if self.verbose > 3:
+                self.cost = sum(map(lambda l: self.weights[l], hs)) + units_cost
 
             if hs is None:
                 # no more hitting sets exist
@@ -530,9 +548,26 @@ class OptUx(object):
                 model = self.oracle.get_model()
                 cs = [l for l in self.sels if model[abs(l) - 1] == -l]
 
+                # naive MCS extraction with a budget on the conflict count
+                if self.reduce_budget:
+                    ss = [l for l in self.sels if model[abs(l) - 1] == +l]
+                    self.oracle.conf_budget(self.reduce_budget)
+
+                    # probing all the literals of the correction set
+                    for l in cs:
+                        if self.oracle.solve_limited(assumptions=[l] + ss) is True:
+                            ss.append(l)
+
+                    cs = sorted(set(cs) - set(ss))
+                    self.oracle.conf_budget(budget=-1)
+
                 # hitting the new correction subset
                 self.hitman.hit(cs, weights=self.weights)
 
+            it += 1
+            if self.verbose > 3:
+                print(f'c iter: {it}, cost: {self.cost}; cs sz: {len(cs)}')
+
     def enumerate(self):
         """
             This is generator method iterating through MUSes and enumerating
@@ -571,11 +606,11 @@ def parse_options():
     """
 
     try:
-        opts, args = getopt.getopt(sys.argv[1:], 'ac:de:hmnp:P:s:t:uvx',
+        opts, args = getopt.getopt(sys.argv[1:], 'ac:de:hmnp:P:r:s:t:uvx',
                                    ['adapt', 'cover=', 'dcalls', 'enum=',
                                     'exhaust', 'help', 'minimize', 'no-disj',
                                     'solver=', 'puresat=', 'process=',
-                                    'unsorted', 'trim=', 'verbose'])
+                                    'reduce=', 'unsorted', 'trim=', 'verbose'])
     except getopt.GetoptError as err:
         sys.stderr.write(str(err).capitalize() + '\n')
         usage()
@@ -591,6 +626,7 @@ def parse_options():
     solver = 'g3'
     process = 0
     puresat = False
+    reduce = 0
     unsorted = False
     trim = 0
     verbose = 1
@@ -619,6 +655,8 @@ def parse_options():
             puresat = str(arg)
         elif opt in ('-P', '--process'):
             process = int(arg)
+        elif opt in ('-r', '--reduce'):
+            reduce = int(arg)
         elif opt in ('-s', '--solver'):
             solver = str(arg)
         elif opt in ('-u', '--unsorted'):
@@ -633,7 +671,7 @@ def parse_options():
             assert False, 'Unhandled option: {0} {1}'.format(opt, arg)
 
     return adapt, cover, dcalls, exhaust, minz, no_disj, trim, to_enum, \
-            solver, process, puresat, unsorted, verbose, args
+            solver, process, puresat, reduce, unsorted, verbose, args
 
 
 #
@@ -659,6 +697,8 @@ def usage():
     print('                                  Requires: unsorted mode, i.e. \'-u\'')
     print('        -P, --process=<int>       Number of processing rounds')
     print('                                  Available values: [0 .. INT_MAX] (default = 0)')
+    print('        -r, --reduce=<int>        Conflict budget when reducing correction sets')
+    print('                                  Available values: [0 .. INT_MAX], -1 (default = 0, meaning no reduction)')
     print('        -s, --solver              SAT solver to use')
     print('                                  Available values: cd15, cd19, g3, g4, lgl, mcb, mcm, mpl, m22, mc, mgh (default = g3)')
     print('        -t, --trim=<int>          How many times to trim unsatisfiable cores')
@@ -672,7 +712,7 @@ def usage():
 #==============================================================================
 if __name__ == '__main__':
     adapt, cover, dcalls, exhaust, minz, no_disj, trim, to_enum, solver, \
-            process, puresat, unsorted, verbose, files = parse_options()
+            process, puresat, reduce, unsorted, verbose, files = parse_options()
 
     if files:
         # reading standard CNF, WCNF, or (W)CNF+
@@ -689,8 +729,8 @@ if __name__ == '__main__':
         # creating an object of OptUx
         with OptUx(formula, solver=solver, adapt=adapt, cover=cover,
                    dcalls=dcalls, exhaust=exhaust, minz=minz, nodisj=no_disj,
-                   process=process, puresat=puresat, unsorted=unsorted,
-                   trim=trim, verbose=verbose) as optux:
+                   process=process, puresat=puresat, reduce=reduce,
+                   unsorted=unsorted, trim=trim, verbose=verbose) as optux:
 
             # iterating over the necessary number of optimal MUSes
             for i, mus in enumerate(optux.enumerate()):

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

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

{python_sat-1.9.dev13 → 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.dev13
+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.dev13 → 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