python-sat 1.9.dev21__cp315-cp315-win_amd64.whl → 1.9.dev22__cp315-cp315-win_amd64.whl

pysat/__init__.py

@@ -22,7 +22,7 @@ del _delvewheel_patch_1_13_2
 
 # current version
 #==============================================================================
-VERSION = (1, 9, 'dev', 21)
+VERSION = (1, 9, 'dev', 22)
 
 
 # PEP440 Format

pysat/engines.py

@@ -141,7 +141,7 @@ class LinearConstraint:
             Constraint initialiser.
         """
 
-        if not weights or type(weights) == dict:
+        if not weights or isinstance(weights, dict):
             # the same literal may appear multiple times in the list
             # so we need to calculate it's actual weight
             cntr = Counter(lits)
@@ -378,7 +378,7 @@ class ParityConstraint:
         for lit in lits:
             if lit < 0:
                 lit = -lit
-                value ^= value
+                value ^= 1
             self.lits.append(lit)
 
         # right-hand side, current value, and variable counter
@@ -1038,6 +1038,9 @@ class BooleanEngine(Propagator):
 
         # forward simplification
         for i, csi in enumerate(self.xors):
+            if not csi.lits:  # eliminated as redundant (0 = 0)
+                continue
+
             v = csi.lits[0]  # pivot variable
 
             # going over all the other constraints and eliminating the pivot
@@ -1091,6 +1094,13 @@ class BooleanEngine(Propagator):
             Update the propagator's state given a new assignment.
         """
 
+        if fixed:
+            self.fixed[abs(lit)] = True
+
+        # the solver may notify us again when an assigned literal gets fixed
+        if self.level[abs(lit)] is not None:
+            return
+
         self.level[abs(lit)] = self.decision_level
 
         if self.qhead is None:
@@ -1100,9 +1110,6 @@ class BooleanEngine(Propagator):
 
         self.trail.append(lit)
 
-        if fixed:
-            self.fixed[abs(lit)] = True
-
     def on_new_level(self):
         """
             Keep track of decision level updates.
@@ -1116,6 +1123,8 @@ class BooleanEngine(Propagator):
             Cancel all the decisions up to a certain level.
         """
 
+        cursor = self.qhead
+
         # undoing the assignments
         while len(self.trlim) > to:
             while len(self.trail) > self.trlim[-1]:
@@ -1142,8 +1151,8 @@ class BooleanEngine(Propagator):
         # updating decision level
         self.decision_level = to
 
-        # updating queue head
-        self.qhead = None
+        # updating queue head (some assignments have not been processed)
+        self.qhead = min(cursor if cursor is not None else 0, len(self.trail))
 
     def check_model(self, model):
         """
@@ -1204,8 +1213,9 @@ class BooleanEngine(Propagator):
                 lit = self.trail[self.qhead]
 
                 # if we have just propagated an opposite value,
-                # we stop and expect conflict analysis to be performed
+                # this is a conflict that needs proper treatment
                 if self.origin[-lit] is not None:
+                    result.append(-lit)
                     break
 
                 self.value[abs(lit)] = lit  # actually setting the value
@@ -1277,7 +1287,7 @@ class BooleanEngine(Propagator):
 
             if nid is not None:
                 # this one has a negative counterpart
-                if pid < len(self.wlst[lit]):
+                if pid < len(self.wlst[lit]) and isinstance(self.wlst[lit][pid], ParityConstraint):
                     # and it's affected
                     self.wlst[lit][pid].wopp[-lit] = pid
 
@@ -1288,7 +1298,7 @@ class BooleanEngine(Propagator):
             self.wlst[-lit][nid] = self.wlst[-lit][-1]
             self.wlst[-lit].pop()
 
-            if nid < len(self.wlst[-lit]):
+            if nid < len(self.wlst[-lit]) and isinstance(self.wlst[-lit][nid], ParityConstraint):
                 self.wlst[-lit][nid].wopp[lit] = nid
 
     def provide_reason(self, lit):

python_sat-1.9.dev22.dist-info/DELVEWHEEL

@@ -0,0 +1,2 @@
+Version: 1.13.2
+Arguments: ['C:\\Users\\runneradmin\\AppData\\Local\\Temp\\cibw-run-aoldlhez\\cp315-win_amd64\\build\\venv\\Scripts\\delvewheel', 'repair', '-w', 'C:\\Users\\runneradmin\\AppData\\Local\\Temp\\cibw-run-aoldlhez\\cp315-win_amd64\\repaired_wheel', '-v', 'C:\\Users\\runneradmin\\AppData\\Local\\Temp\\cibw-run-aoldlhez\\cp315-win_amd64\\built_wheel\\python_sat-1.9.dev22-cp315-cp315-win_amd64.whl']

{python_sat-1.9.dev21.dist-info → python_sat-1.9.dev22.dist-info}/METADATA

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

@@ -1,8 +1,8 @@
-pycard.cp315-win_amd64.pyd,sha256=xvNvX969Gbsf-i_J3gstag2q0GJQk1dnUKnpeGc16co,77312
-pyformula.cp315-win_amd64.pyd,sha256=d9kuLnGCu18vHzxAAbVrHA0oV_XyAdJXXgOw0GYv4mA,33792
-pysolvers.cp315-win_amd64.pyd,sha256=m-wD6Augo5yKLRfSJ-aHAZjoMOhoftr5SLjwbUibCRc,3663360
+pycard.cp315-win_amd64.pyd,sha256=tef7CM3MyAIB0svbhn20WpE_xsIcCjBLDF0xNy4kdJE,77312
+pyformula.cp315-win_amd64.pyd,sha256=jVWzixCKAeF-ZNecwRm2YUqDsJXklovIb5euB_9EceQ,33792
+pysolvers.cp315-win_amd64.pyd,sha256=Pvzd9Dj4MBKmTGsk4DtSyxLJN4qrv1BGyag8JsguqMU,3663360
 pysat/card.py,sha256=JufbOKVdVrxABb3oKci3869eQytso58gLTqISac4H58,39252
-pysat/engines.py,sha256=K4B9HrI6ni3qN9EW6siXhYZ6Gows5Z0ReQvl4Ks_-p0,47692
+pysat/engines.py,sha256=G3hAOFuqc_GGf8ow5gKRLvNh48jiLInnQtIZSRwYuhs,48202
 pysat/formula.py,sha256=GCTvBA9TI7Q2klIaa6R1Suz2IwilNK4-31o8ADLXJaE,221485
 pysat/integer.py,sha256=McihZOmelBRKfw6Ng0A86_D_vLbXSvxla05tVWNyowk,99859
 pysat/pb.py,sha256=DjsHXwu5TG1FSbHg11DOV7kyZvtXHxknwHIL-z7udxQ,17974
@@ -10,7 +10,7 @@ pysat/process.py,sha256=W0_Sm5rqas0SwZd5KgTuB35j2dA-WCg1Y4yqmIwLA9U,16255
 pysat/solvers.py,sha256=RTmMGLW6jeA0zOTzJWRpHTQEI1lLZAVHOg7w5BbysqI,332387
 pysat/_fileio.py,sha256=FxmRrrmCDay-2Guhdy0YhDlmVDAsCNaqfHzz18n_O5I,6924
 pysat/_utils.py,sha256=8mNX5XUKd9Bha99-jfvYgX2z2_CsE9z0DdEXCScSdCE,1398
-pysat/__init__.py,sha256=u6jC4wotdwtlBgLvhzHgKt-Xu4XfY_FhnLQNGoDSumQ,1018
+pysat/__init__.py,sha256=XG9iEubRItEdWdIvVpLAuEouzOynzprhtFWYtKRhS20,1018
 pysat/allies/approxmc.py,sha256=OV2nCeOKN69wXzGwHS9MH7exxYKW3wjMCwLD3GQ0Xqg,13971
 pysat/allies/unigen.py,sha256=d3uMDKiJzA7RLwfuZL4aniYbHPo28SqQd-h3jpmoOxU,17153
 pysat/allies/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -29,24 +29,24 @@ pysat/examples/primer.py,sha256=zSC3mx1I-t2yeo-Yn1bAK42rXi4VtFIgSJT-oiozUiU,2399
 pysat/examples/rc2.py,sha256=OkGxvQ8ufZME1GlDjmxB55hVHT5J526TWIncEBMWkn8,81083
 pysat/examples/usage.py,sha256=9IBfW4lBHoZVBEFURW73jhc12zSeFg8_-to9o3gc5nM,2246
 pysat/examples/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-python_sat-1.9.dev21.data/platlib/msvcp140-a4c2229bdc2a2a630acdc095b4d86008.dll,sha256=pMIim9wqKmMKzcCVtNhgCOXD47x3cxdDVPPaT1vrnN4,575056
-python_sat-1.9.dev21.data/scripts/approxmc.py,sha256=h6aMnSpIaYXkTMq-tCSzNWwKb0AG-vTH4vuLWGn5Q4s,13958
-python_sat-1.9.dev21.data/scripts/bbscan.py,sha256=xGxklG6Gc_UBaM8QvEJDOtQhEamxAncfsd65E-0JcAc,22696
-python_sat-1.9.dev21.data/scripts/bica.py,sha256=659K6gdRBgYeNiLjQc_VnulXhbTHxnUljNYhXx-frwk,28413
-python_sat-1.9.dev21.data/scripts/fm.py,sha256=ek1QDsuxiq1zm1PBLbrSXXEE89RP9_DYwVNnyB3eO4s,18650
-python_sat-1.9.dev21.data/scripts/genhard.py,sha256=YswufT272W4xTJrSBlOC2ucJx4RK4ntfRv73rASrx30,19520
-python_sat-1.9.dev21.data/scripts/lbx.py,sha256=1wAyfFjQQkhHte1OnSVhJviVmSEwWc0DaLro8fs6eik,24083
-python_sat-1.9.dev21.data/scripts/lsu.py,sha256=EpXQCu8ZdYoNgi70Uc1b8drOwp1fo82mhGbpjonjIzw,16687
-python_sat-1.9.dev21.data/scripts/mcsls.py,sha256=wetecyPhjfgu-jkjoZ4nrg3PiR2tCtLWLnQeiDCX5UU,22899
-python_sat-1.9.dev21.data/scripts/models.py,sha256=UmMmklExzyXAIhh-0i038nQb7hTK6CbdV1M6m2GxxSI,5917
-python_sat-1.9.dev21.data/scripts/musx.py,sha256=LwK10YuQ8pIf1TJwp0HKp54O0hdk8zBy3TIfGsF1yW0,11277
-python_sat-1.9.dev21.data/scripts/optux.py,sha256=9-4ynzXVYq7y67vy-emMbMx_gSlOBMDBX4VWkjSyHgE,30508
-python_sat-1.9.dev21.data/scripts/primer.py,sha256=iE9Vy0XyeySIY-7-L_VMwRahsIVCEmm9k04OhLwDvuw,23982
-python_sat-1.9.dev21.data/scripts/rc2.py,sha256=vIzgJEHSleKl45B_eENP31avWORuhaP5ogbLbf_N1HY,81070
-python_sat-1.9.dev21.data/scripts/unigen.py,sha256=e-HC2UxWA8MTN90VslkHX1ZlTPjdhI4etzkn6G8YAX4,17140
-python_sat-1.9.dev21.dist-info/DELVEWHEEL,sha256=4dIXObG4FoGyrwrGR93jfJeqXyoqVTQX-AYDhxlpuvU,413
-python_sat-1.9.dev21.dist-info/METADATA,sha256=bYprHqRIHNVa5DV2wUJbFAVoddVEPjO6Cvak6w839kI,1854
-python_sat-1.9.dev21.dist-info/RECORD,,
-python_sat-1.9.dev21.dist-info/top_level.txt,sha256=0SLg3yVqNpeiqOwFcAo3OxXhqAnflCmb5Fjl6gsl-Do,33
-python_sat-1.9.dev21.dist-info/WHEEL,sha256=0gLwYZa0C2fhgCxWR2c8HahwUiopqonVCV0wVwEg6fE,101
-python_sat-1.9.dev21.dist-info/licenses/LICENSE.txt,sha256=q-8zFb06i-6m_ueuQhkc1J4Ew2QByvODVIgm6fZYdTY,1130
+python_sat-1.9.dev22.data/platlib/msvcp140-a4c2229bdc2a2a630acdc095b4d86008.dll,sha256=pMIim9wqKmMKzcCVtNhgCOXD47x3cxdDVPPaT1vrnN4,575056
+python_sat-1.9.dev22.data/scripts/approxmc.py,sha256=h6aMnSpIaYXkTMq-tCSzNWwKb0AG-vTH4vuLWGn5Q4s,13958
+python_sat-1.9.dev22.data/scripts/bbscan.py,sha256=xGxklG6Gc_UBaM8QvEJDOtQhEamxAncfsd65E-0JcAc,22696
+python_sat-1.9.dev22.data/scripts/bica.py,sha256=659K6gdRBgYeNiLjQc_VnulXhbTHxnUljNYhXx-frwk,28413
+python_sat-1.9.dev22.data/scripts/fm.py,sha256=ek1QDsuxiq1zm1PBLbrSXXEE89RP9_DYwVNnyB3eO4s,18650
+python_sat-1.9.dev22.data/scripts/genhard.py,sha256=YswufT272W4xTJrSBlOC2ucJx4RK4ntfRv73rASrx30,19520
+python_sat-1.9.dev22.data/scripts/lbx.py,sha256=1wAyfFjQQkhHte1OnSVhJviVmSEwWc0DaLro8fs6eik,24083
+python_sat-1.9.dev22.data/scripts/lsu.py,sha256=EpXQCu8ZdYoNgi70Uc1b8drOwp1fo82mhGbpjonjIzw,16687
+python_sat-1.9.dev22.data/scripts/mcsls.py,sha256=wetecyPhjfgu-jkjoZ4nrg3PiR2tCtLWLnQeiDCX5UU,22899
+python_sat-1.9.dev22.data/scripts/models.py,sha256=UmMmklExzyXAIhh-0i038nQb7hTK6CbdV1M6m2GxxSI,5917
+python_sat-1.9.dev22.data/scripts/musx.py,sha256=LwK10YuQ8pIf1TJwp0HKp54O0hdk8zBy3TIfGsF1yW0,11277
+python_sat-1.9.dev22.data/scripts/optux.py,sha256=9-4ynzXVYq7y67vy-emMbMx_gSlOBMDBX4VWkjSyHgE,30508
+python_sat-1.9.dev22.data/scripts/primer.py,sha256=iE9Vy0XyeySIY-7-L_VMwRahsIVCEmm9k04OhLwDvuw,23982
+python_sat-1.9.dev22.data/scripts/rc2.py,sha256=vIzgJEHSleKl45B_eENP31avWORuhaP5ogbLbf_N1HY,81070
+python_sat-1.9.dev22.data/scripts/unigen.py,sha256=e-HC2UxWA8MTN90VslkHX1ZlTPjdhI4etzkn6G8YAX4,17140
+python_sat-1.9.dev22.dist-info/DELVEWHEEL,sha256=OVayoru_cuO5FCImHSOpRh8ZXCELyBN41oehf3dMm_8,413
+python_sat-1.9.dev22.dist-info/METADATA,sha256=_U0sZZ114kavqtqiooA_JEYZg9-B7ZfFHSsnoLzEWrE,1854
+python_sat-1.9.dev22.dist-info/RECORD,,
+python_sat-1.9.dev22.dist-info/top_level.txt,sha256=0SLg3yVqNpeiqOwFcAo3OxXhqAnflCmb5Fjl6gsl-Do,33
+python_sat-1.9.dev22.dist-info/WHEEL,sha256=0gLwYZa0C2fhgCxWR2c8HahwUiopqonVCV0wVwEg6fE,101
+python_sat-1.9.dev22.dist-info/licenses/LICENSE.txt,sha256=q-8zFb06i-6m_ueuQhkc1J4Ew2QByvODVIgm6fZYdTY,1130

python_sat-1.9.dev21.dist-info/DELVEWHEEL

@@ -1,2 +0,0 @@
-Version: 1.13.2
-Arguments: ['C:\\Users\\runneradmin\\AppData\\Local\\Temp\\cibw-run-_8pjchug\\cp315-win_amd64\\build\\venv\\Scripts\\delvewheel', 'repair', '-w', 'C:\\Users\\runneradmin\\AppData\\Local\\Temp\\cibw-run-_8pjchug\\cp315-win_amd64\\repaired_wheel', '-v', 'C:\\Users\\runneradmin\\AppData\\Local\\Temp\\cibw-run-_8pjchug\\cp315-win_amd64\\built_wheel\\python_sat-1.9.dev21-cp315-cp315-win_amd64.whl']