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

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

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

@@ -237,6 +237,7 @@ class RC2(object):
         self.bnds = {}  # a mapping from sum assumptions to totalizer bounds
         self.tobj = {}  # a mapping from sum assumptions to totalizer objects
         self.swgt = {}  # a mapping from sum assumptions to their core weights
+        self.filt = []   # contextual assumptions (useless in RC2)
         self.cost = 0
 
         # mappings between internal and external variables
@@ -440,7 +441,7 @@ class RC2(object):
         # introduce new variables if necessary
         cl = list(map(lambda l: self._map_extlit(l), clause if not len(clause) == 2 or not type(clause[0]) in (list, tuple, set) else clause[0]))
 
-        if not weight:
+        if weight is None:
             if not len(clause) == 2 or not type(clause[0]) in (list, tuple, set):
                 # the clause is hard, and so we simply add it to the SAT oracle
                 self.oracle.add_clause(cl)
@@ -464,17 +465,18 @@ class RC2(object):
                 cl.append(-selv)
                 self.oracle.add_clause(cl)
 
-            if selv not in self.wght:
-                # record selector and its weight
-                self.sels.append(selv)
-                self.wght[selv] = weight
-                self.smap[selv] = len(self.sels) - 1
-            else:
-                # selector is not new; increment its weight
-                self.wght[selv] += weight
+            if weight:
+                if selv not in self.wght:
+                    # record selector and its weight
+                    self.sels.append(selv)
+                    self.wght[selv] = weight
+                    self.smap[selv] = len(self.sels) - 1
+                else:
+                    # selector is not new; increment its weight
+                    self.wght[selv] += weight
 
-            self.sall.append(selv)
-            self.sels_set.add(selv)
+                self.sall.append(selv)
+                self.sels_set.add(selv)
 
             return selv
 
@@ -658,6 +660,13 @@ class RC2(object):
             else:
                 done = True
 
+    def active_assumps(self):
+        """
+            Get the assumptions for the main core-guided loop.
+        """
+
+        return self.sels + self.sums
+
     def compute_(self):
         """
             Main core-guided loop, which iteratively calls a SAT
@@ -679,7 +688,7 @@ class RC2(object):
         self.interrupted = False
 
         # main solving loop
-        while not self._call_oracle(assumptions=self.sels + self.sums,
+        while not self._call_oracle(assumptions=self.active_assumps(),
                                     expect_interrupt=self.expect_interrupt):
 
             # even if the call has been interrupted, we
@@ -1055,7 +1064,7 @@ class RC2(object):
         """
 
         # the first case is simpler
-        if self._call_oracle(assumptions=[-tobj.rhs[1]]):
+        if self._call_oracle(assumptions=self.filt + [-tobj.rhs[1]]):
             return 1
         else:
             self.cost += self.minw
@@ -1068,7 +1077,7 @@ class RC2(object):
             # increasing the bound
             self.update_sum(-tobj.rhs[i - 1])
 
-            if self._call_oracle(assumptions=[-tobj.rhs[i]]):
+            if self._call_oracle(assumptions=self.filt + [-tobj.rhs[i]]):
                 # the bound should be equal to i
                 return i
 
@@ -1244,10 +1253,9 @@ class RC2(object):
             # right-hand side is always equal to the number of input literals
             rhs = len(t.lits)
 
-            if b < rhs:
+            if b < rhs and not t.rhs[b]:
                 # creating an additional bound
-                if not t.rhs[b]:
-                    t.rhs[b] = self.pool.id()
+                t.rhs[b] = self.pool.id()
 
                 # a new at-most-b constraint
                 amb = [[-t.rhs[b]] * (rhs - b) + t.lits, rhs]

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

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