python-sat 1.9.dev5__cp313-cp313-win_amd64.whl → 1.9.dev7__cp313-cp313-win_amd64.whl

pysat/__init__.py

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

pysat/engines.py

@@ -564,8 +564,11 @@ class Propagator(object):
                 def provide_reason(self, lit: int) -> List[int]:
                     pass      # explain why a given literal was propagated
 
+                def has_clause(self) -> bool:
+                    return False  # optional: report whether an external clause exists
+
                 def add_clause(self) -> List[int]:
-                    return [] # add an(y) external clause to the solver
+                    return [] # if has_clause() is used, may also be the empty clause
     """
 
     def __init__(self):
@@ -687,10 +690,9 @@ class Propagator(object):
 
     def add_clause(self) -> List[int]:
         """
-            The method is called by the solver to add an external clause if
-            there is any. The clause can be arbitrary but if it is
-            root-satisfied or tautological, the solver will ignore it without
-            learning it.
+            The method is called by the solver to obtain an external clause.
+            The clause can be arbitrary but if it is root-satisfied or
+            tautological, the solver will ignore it without learning it.
 
             Root-falsified literals are eagerly removed from the clause.
             Falsified clauses trigger conflict analysis, propagating clauses
@@ -700,6 +702,19 @@ class Propagator(object):
             An empty clause (or root falsified clause, see above) makes the
             formula unsatisfiable and stops the search immediately.
 
+            .. note::
+
+                The exact meaning of returning ``[]`` depends on whether the
+                propagator defines method ``has_clause()``.
+
+                - If ``has_clause()`` is defined, the solver first queries it.
+                  Whenever it returns ``True``, the follow-up call of
+                  :meth:`add_clause` is expected to return the clause itself,
+                  and ``[]`` denotes the actual empty clause.
+                - Otherwise, if ``has_clause()`` is undefined, returning
+                  ``[]`` from :meth:`add_clause` is interpreted as saying that
+                  there is no clause to add.
+
             :rtype: iterable(int)
         """
 
@@ -1283,14 +1298,25 @@ class BooleanEngine(Propagator):
 
         return [lit] + self.origin[lit].justify(lit)
 
+    def has_clause(self):
+        """
+            Check whether the engine currently has an external clause to add.
+            When queried separately by the solver, this lets
+            :meth:`add_clause` return ``[]`` as an actual empty clause.
+        """
+
+        return self.falsified is not None
+
     def add_clause(self):
         """
-            Extract a new clause to add to the solver if one exists; return an
-            empty clause ``[]`` otherwise.
+            Extract the external clause previously announced by
+            :meth:`has_clause`.
         """
 
-        if self.falsified is None:
-            return []
+        # # old behaviour checking if we have a clause to add;
+        # # commenting this out because we have has_clause() now
+        # if self.falsified is None:
+        #     return []
 
         to_add = self.falsified.explain_failure()
 

pysat/examples/rc2.py

@@ -409,6 +409,9 @@ class RC2(object):
             :type clause: iterable(int)
             :type weight: int
 
+            :return: selector literal for a soft clause and ``None`` for a hard one
+            :rtype: int or None
+
             .. code-block:: python
 
                 >>> from pysat.examples.rc2 import RC2
@@ -449,6 +452,8 @@ class RC2(object):
                         '{0} does not support native cardinality constraints. Make sure you use the right type of formula.'.format(self.solver)
 
                 self.oracle.add_atmost(cl, clause[1], weights=clause[2] if len(clause) == 3 else [])
+
+            return None
         else:
             # soft clauses should be augmented with a selector
             selv = cl[0]  # for a unit clause, no selector is needed
@@ -472,6 +477,8 @@ class RC2(object):
             self.sall.append(selv)
             self.sels_set.add(selv)
 
+            return selv
+
     def delete(self):
         """
             Explicit destructor of the internal SAT oracle and all the

pysat/formula.py

@@ -4129,6 +4129,7 @@ class WCNF(object):
         # normalize it, i.e. transform into a set of clauses
         # with a positive weight
         if negs:
+            self.nv = max(self.nv, max(map(lambda cl: max(map(abs, cl[0])), negs)))
             self.normalize_negatives(negs)
 
         # if topw was unspecified and assigned to +infinity,
@@ -5380,6 +5381,7 @@ class WCNFPlus(WCNF, object):
         # normalize it, i.e. transform into a set of clauses
         # with a positive weight
         if negs:
+            self.nv = max(self.nv, max(map(lambda cl: max(map(abs, cl[0])), negs)))
             self.normalize_negatives(negs)
 
         # if topw was unspecified and assigned to +infinity,

{python_sat-1.9.dev5.data → python_sat-1.9.dev7.data}/scripts/rc2.py

@@ -409,6 +409,9 @@ class RC2(object):
             :type clause: iterable(int)
             :type weight: int
 
+            :return: selector literal for a soft clause and ``None`` for a hard one
+            :rtype: int or None
+
             .. code-block:: python
 
                 >>> from pysat.examples.rc2 import RC2
@@ -449,6 +452,8 @@ class RC2(object):
                         '{0} does not support native cardinality constraints. Make sure you use the right type of formula.'.format(self.solver)
 
                 self.oracle.add_atmost(cl, clause[1], weights=clause[2] if len(clause) == 3 else [])
+
+            return None
         else:
             # soft clauses should be augmented with a selector
             selv = cl[0]  # for a unit clause, no selector is needed
@@ -472,6 +477,8 @@ class RC2(object):
             self.sall.append(selv)
             self.sels_set.add(selv)
 
+            return selv
+
     def delete(self):
         """
             Explicit destructor of the internal SAT oracle and all the

{python_sat-1.9.dev5.dist-info → python_sat-1.9.dev7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-sat
-Version: 1.9.dev5
+Version: 1.9.dev7
 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.dev5.dist-info → python_sat-1.9.dev7.dist-info}/RECORD

@@ -1,12 +1,12 @@
-pycard.cp313-win_amd64.pyd,sha256=oEHFR99AKhuXAUSiAvxNANb8IpiMg2YjOLDneg88z-M,71680
-pyformula.cp313-win_amd64.pyd,sha256=Uh0M7YXgOgGT0nQ9JUMyCWcFsFFeDUD71JE7SmPG_Ko,30208
-pysolvers.cp313-win_amd64.pyd,sha256=kHnoNbflXZmK-ZFWP2e8vwViScRFdWUG5-DObFPoCxU,3332608
-pysat/__init__.py,sha256=OwxlXwJeeh9Y0cxfqZ_0gm9r6oIZDBs0m3XQUCMDGc0,680
+pycard.cp313-win_amd64.pyd,sha256=7mLtentpGvV6ABZrYrgLQu3LdLh4tQKZE3EVwIlI2fM,71680
+pyformula.cp313-win_amd64.pyd,sha256=mYBsZFS_fkmpzy4maUvyjyiF3s7qE88-4BgFCvzUOh0,31232
+pysolvers.cp313-win_amd64.pyd,sha256=EBm6zbuUAMxU-omqOSlP7-HGPVpn_as19HM2RSnsct0,3340288
+pysat/__init__.py,sha256=4zSEPAX1iKQpFV3wsG_VVidiuVQN4i9k2Q7X-2hFQWw,680
 pysat/_fileio.py,sha256=pXRGGAaP7U8r3bpn5ShseCSHROXqi7ygaYe6T6QORto,6700
 pysat/_utils.py,sha256=4cv40p70FKvjCTKq8GqzS_jlxF74cp_lojTZSim_qJE,1340
 pysat/card.py,sha256=rav3_t_mCzbLw8SAdXcOh-PNbFtaATVSAJzpbygqiQ4,30066
-pysat/engines.py,sha256=PzcZJ4zFXDHfcSSHF7iPadtrwSVEt4t9B_cO5epwTZk,45182
-pysat/formula.py,sha256=3VdJYS6jZDRWSwn_KfofTmwD_x401O-3rQyfzgORL6o,210084
+pysat/engines.py,sha256=yAYA_PzIGr_uRF85M7kL2bipjpLbY7jdfFKTdY-yW8I,46364
+pysat/formula.py,sha256=tHltOuKQ5L7nefYlKDzPU0fWXol6-YUU1lexihNBRV4,210252
 pysat/integer.py,sha256=um6FXUzmBHUFlWXNKs0xLh9Jss3jiEin2Er_U41KtkA,90203
 pysat/pb.py,sha256=DMy8UfbbpfJo5cTZul9W1o_mlr-B0lCIEseZjrQYd8A,17816
 pysat/process.py,sha256=8lNbpEKipFZjbQ9DCJPfdL8eZHx-ltNuu7h4geWWdJY,12739
@@ -27,24 +27,24 @@ pysat/examples/models.py,sha256=cdIR8iOrYu2ibqfcb_kEKXQMCfmFiz7cvZ3y1dur3Qw,5741
 pysat/examples/musx.py,sha256=hswVGkjm95lhOyrtl1e4ouDyNSy-hWvQ05084Xnck9I,10946
 pysat/examples/optux.py,sha256=8eYHO_uhL_4ugb-hRv2s6cnOwTurfqkpbdnK9T4iDtw,27697
 pysat/examples/primer.py,sha256=0OeV9R6mWyIr2BKIitkrfgY3q2XE-sV1ZLSiybGRFXw,23375
-pysat/examples/rc2.py,sha256=y8UWP8qQcrWW8wGTDDPMdbuQVFAN1Gafb0x0gshkVZ4,76817
+pysat/examples/rc2.py,sha256=i1sH8ukXng56Vx-KnA2GiOvC_aCa_vFRVGoTMJoZjW4,76984
 pysat/examples/usage.py,sha256=x9luw6pyKAAndlxAeUWFhS4aLSVmD2t_j_5uA9YddHg,2183
-python_sat-1.9.dev5.data/scripts/approxmc.py,sha256=h6aMnSpIaYXkTMq-tCSzNWwKb0AG-vTH4vuLWGn5Q4s,13958
-python_sat-1.9.dev5.data/scripts/bbscan.py,sha256=xGxklG6Gc_UBaM8QvEJDOtQhEamxAncfsd65E-0JcAc,22696
-python_sat-1.9.dev5.data/scripts/bica.py,sha256=q6fQGsFp1EaaYRZGBsDFOIJPVScr5k42XFskBzW69mA,27776
-python_sat-1.9.dev5.data/scripts/fm.py,sha256=ek1QDsuxiq1zm1PBLbrSXXEE89RP9_DYwVNnyB3eO4s,18650
-python_sat-1.9.dev5.data/scripts/genhard.py,sha256=YswufT272W4xTJrSBlOC2ucJx4RK4ntfRv73rASrx30,19520
-python_sat-1.9.dev5.data/scripts/lbx.py,sha256=rCQ6zH_DXoVjBrzhZHSDJMfP92-hz2JVwh6e4m44AUc,23874
-python_sat-1.9.dev5.data/scripts/lsu.py,sha256=cAATg2x0Cu1LC8KszMctHqywjq7pygkb9vWNBrbUEZs,16681
-python_sat-1.9.dev5.data/scripts/mcsls.py,sha256=cTJQMIO-4iho412wG0JhvhqXWy81U0RQV8wwOgkri3Q,22690
-python_sat-1.9.dev5.data/scripts/models.py,sha256=UmMmklExzyXAIhh-0i038nQb7hTK6CbdV1M6m2GxxSI,5917
-python_sat-1.9.dev5.data/scripts/musx.py,sha256=LwK10YuQ8pIf1TJwp0HKp54O0hdk8zBy3TIfGsF1yW0,11277
-python_sat-1.9.dev5.data/scripts/optux.py,sha256=t20YBZH4_axTkRMapq-DL-fq-9tBybPWo0pkhIyGhDw,28394
-python_sat-1.9.dev5.data/scripts/primer.py,sha256=iE9Vy0XyeySIY-7-L_VMwRahsIVCEmm9k04OhLwDvuw,23982
-python_sat-1.9.dev5.data/scripts/rc2.py,sha256=EgOSxypvgKz1rWeg7RBbwkLx4pOeldPEUK_l-2flySM,78830
-python_sat-1.9.dev5.data/scripts/unigen.py,sha256=e-HC2UxWA8MTN90VslkHX1ZlTPjdhI4etzkn6G8YAX4,17140
-python_sat-1.9.dev5.dist-info/licenses/LICENSE.txt,sha256=6QMvEzxqdPXEoiAZUBaZLeLF4hW2S81fjKz_THER0uQ,1109
-python_sat-1.9.dev5.dist-info/METADATA,sha256=pI1rE18WzkZbwyJgeFGwERd_2wvfqvC7wap4Sb1hfFU,1783
-python_sat-1.9.dev5.dist-info/WHEEL,sha256=x5Wpw_tLx5PQKiWdxpqvs0e7Sg-SO0mTWdEADYDGPGA,101
-python_sat-1.9.dev5.dist-info/top_level.txt,sha256=0SLg3yVqNpeiqOwFcAo3OxXhqAnflCmb5Fjl6gsl-Do,33
-python_sat-1.9.dev5.dist-info/RECORD,,
+python_sat-1.9.dev7.data/scripts/approxmc.py,sha256=h6aMnSpIaYXkTMq-tCSzNWwKb0AG-vTH4vuLWGn5Q4s,13958
+python_sat-1.9.dev7.data/scripts/bbscan.py,sha256=xGxklG6Gc_UBaM8QvEJDOtQhEamxAncfsd65E-0JcAc,22696
+python_sat-1.9.dev7.data/scripts/bica.py,sha256=q6fQGsFp1EaaYRZGBsDFOIJPVScr5k42XFskBzW69mA,27776
+python_sat-1.9.dev7.data/scripts/fm.py,sha256=ek1QDsuxiq1zm1PBLbrSXXEE89RP9_DYwVNnyB3eO4s,18650
+python_sat-1.9.dev7.data/scripts/genhard.py,sha256=YswufT272W4xTJrSBlOC2ucJx4RK4ntfRv73rASrx30,19520
+python_sat-1.9.dev7.data/scripts/lbx.py,sha256=rCQ6zH_DXoVjBrzhZHSDJMfP92-hz2JVwh6e4m44AUc,23874
+python_sat-1.9.dev7.data/scripts/lsu.py,sha256=cAATg2x0Cu1LC8KszMctHqywjq7pygkb9vWNBrbUEZs,16681
+python_sat-1.9.dev7.data/scripts/mcsls.py,sha256=cTJQMIO-4iho412wG0JhvhqXWy81U0RQV8wwOgkri3Q,22690
+python_sat-1.9.dev7.data/scripts/models.py,sha256=UmMmklExzyXAIhh-0i038nQb7hTK6CbdV1M6m2GxxSI,5917
+python_sat-1.9.dev7.data/scripts/musx.py,sha256=LwK10YuQ8pIf1TJwp0HKp54O0hdk8zBy3TIfGsF1yW0,11277
+python_sat-1.9.dev7.data/scripts/optux.py,sha256=t20YBZH4_axTkRMapq-DL-fq-9tBybPWo0pkhIyGhDw,28394
+python_sat-1.9.dev7.data/scripts/primer.py,sha256=iE9Vy0XyeySIY-7-L_VMwRahsIVCEmm9k04OhLwDvuw,23982
+python_sat-1.9.dev7.data/scripts/rc2.py,sha256=yJL34GQclQakHH_Ksgt431Xwi7lmTZtiRI0VClHlirU,79004
+python_sat-1.9.dev7.data/scripts/unigen.py,sha256=e-HC2UxWA8MTN90VslkHX1ZlTPjdhI4etzkn6G8YAX4,17140
+python_sat-1.9.dev7.dist-info/licenses/LICENSE.txt,sha256=6QMvEzxqdPXEoiAZUBaZLeLF4hW2S81fjKz_THER0uQ,1109
+python_sat-1.9.dev7.dist-info/METADATA,sha256=TqwyTig9BSaYLrlVOU5AO7FduVX6kp4G9WuGfjbqOEs,1783
+python_sat-1.9.dev7.dist-info/WHEEL,sha256=AP_wkikJcUkDPUGvTNydv7g0R7BhW1u_fVHNKW7TJyI,101
+python_sat-1.9.dev7.dist-info/top_level.txt,sha256=0SLg3yVqNpeiqOwFcAo3OxXhqAnflCmb5Fjl6gsl-Do,33
+python_sat-1.9.dev7.dist-info/RECORD,,

{python_sat-1.9.dev5.dist-info → python_sat-1.9.dev7.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (82.0.1)
+Generator: setuptools (83.0.0)
 Root-Is-Purelib: false
 Tag: cp313-cp313-win_amd64