python-sat 1.8.dev18__tar.gz → 1.8.dev20__tar.gz

{python-sat-1.8.dev18/python_sat.egg-info → python_sat-1.8.dev20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-sat
-Version: 1.8.dev18
+Version: 1.8.dev20
 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.8.dev18 → python_sat-1.8.dev20}/examples/bica.py

@@ -51,7 +51,7 @@
     navigation to determine the Southern Celestial Pole.)
 
     .. [1] Alexey Ignatiev, Alessandro Previti, Joao Marques-Silva.
-        *SAT-Based Formula Simplification*. SAT 2015. pp. 287-298
+        *SAT-Based Formula Simplification*. SAT 2015. pp. 287-298
 
     .. [2] Willard V. Quine. *The Problem of Simplifying Truth Functions*.
         American Mathematical Monthly 59(8). 1952. pp. 521-531
@@ -262,10 +262,10 @@ class Bica:
 
     """
 
-    def __init__(self, formula, negated=None, target='cnf', psolver='g3',
+    def __init__(self, formula, negated=None, target='cnf', psolver='cd19',
                  padapt=False, pdcalls=False, pexhaust=False, pminz=False,
                  ppuresat=False, psearch='lin', punsorted=False, ptrim=False,
-                 osolver='g3', oadapt=False, odcalls=False, oexhaust=False,
+                 osolver='mgh', oadapt=False, odcalls=False, oexhaust=False,
                  ominz=False, onodisj=False, opuresat=False, ounsorted=False,
                  otrim=False, weighted=False, verbose=0):
         """
@@ -538,7 +538,7 @@ def parse_options():
     ominz = False
     nodisj = False
     psolver = 'cd19'
-    osolver = 'cd19'
+    osolver = 'mgh'
     ppuresat = False
     opuresat = False
     punsorted = False
@@ -638,7 +638,7 @@ def usage():
     print('        -s, --psolver              SAT solver to use [Primer]')
     print('                                   Available values: cd, cd15, cd19, g3, g41, g42, lgl, mcb, mcm, mpl, m22, mc, mg3, mgh (default = cd19)')
     print('        -S, --osolver              SAT solver to use [OptUx]')
-    print('                                   Available values: cd, cd15, cd19, g3, g41, g42, lgl, mcb, mcm, mpl, m22, mc, mg3, mgh (default = cd19)')
+    print('                                   Available values: cd, cd15, cd19, g3, g41, g42, lgl, mcb, mcm, mpl, m22, mc, mg3, mgh (default = mgh)')
     print('        -t, --ptrim=<int>          How many times to trim unsatisfiable cores [Primer]')
     print('                                   Available values: [0 .. INT_MAX] (default = 0)')
     print('        -T, --otrim=<int>          How many times to trim unsatisfiable cores [OptUx]')

{python-sat-1.8.dev18 → python_sat-1.8.dev20}/pysat/__init__.py

@@ -10,7 +10,7 @@
 
 # current version
 #==============================================================================
-VERSION = (1, 8, 'dev', 18)
+VERSION = (1, 8, 'dev', 20)
 
 
 # PEP440 Format

{python-sat-1.8.dev18 → python_sat-1.8.dev20}/pysat/_fileio.py

@@ -22,11 +22,12 @@
     Module description
     ==================
 
-    This simple module provides a basic interface to input/output operations on
-    files. Its key design feature is the ability to work with both uncompressed
-    and compressed files through a unified interface, thus, making it easier
-    for a user to deal with various types of compressed files. The compression
-    types supported include gzip, bzip2, and lzma (xz).
+    This simple module provides a basic interface to input/output operations
+    on files. Its key design feature is the ability to work with both
+    uncompressed and compressed files through a unified interface, thus,
+    making it easier for a user to deal with various types of compressed
+    files. The compression types supported include gzip, bzip2, lzma (xz), and
+    zstandard (zstd).
 
     The module is supposed to be mainly used by :mod:`pysat.formula`.
 
@@ -66,6 +67,13 @@ except ImportError:
     except ImportError:  # for Python2 without lzma
         lzma_present = False
 
+zstd_present = True
+try:
+    from compression import zstd
+except ImportError:  # zstandard is introduced in Python 3.14
+    zstd_present = False
+
+
 
 #
 #==============================================================================
@@ -75,9 +83,10 @@ class FileObject(object):
         open files creating standard file pointers and closing them. The class
         is used when opening DIMACS files for reading and writing. Supports
         both uncompressed and compressed files. Compression algorithms
-        supported are ``gzip``, ``bzip2``, and ``lzma``. Algorithm ``lzma`` can
-        be used in Python 3 by default and also in Python 2 if the
-        ``backports.lzma`` package is installed.
+        supported are ``gzip``, ``bzip2``, ``lzma``, and ``zstd``. Algorithm
+        ``lzma`` can be used in Python 3 by default and also in Python 2 if
+        the ``backports.lzma`` package is installed. Algorithm ``zstandard``
+        can be used in Python 3.14 and later.
 
         Note that the class opens a file in text mode.
 
@@ -90,8 +99,9 @@ class FileObject(object):
         :type compression: str
 
         Compression type can be ``None``, ``'gzip'``, ``'bzip2'``, ``'lzma'``,
-        as well as ``'use_ext'``. If ``'use_ext'`` is specified, compression
-        algorithm is defined by the extension of the given file name.
+        ``'zstd'``, as well as ``'use_ext'``. If ``'use_ext'`` is specified,
+        compression algorithm is defined by the extension of the given file
+        name.
     """
 
     def __init__(self, name, mode='r', compression=None):
@@ -109,9 +119,9 @@ class FileObject(object):
 
     def open(self, name, mode='r', compression=None):
         """
-            Open a file pointer. Note that a file is *always* opened in text
-            mode. The method inherits its input parameters from the constructor
-            of :class:`FileObject`.
+            Open a file pointer. Note that a file is *always* opened in
+            text mode. The method inherits its input parameters from the
+            constructor of :class:`FileObject`.
         """
 
         if compression == 'use_ext':
@@ -138,11 +148,15 @@ class FileObject(object):
                     self.fp = codecs.getreader('ascii')(self.fp_extra)
                 else:  # mode == 'w'
                     self.fp = codecs.getwriter('ascii')(self.fp_extra)
-        else:  # self.ctype == 'lzma'
+        elif self.ctype == 'lzma':
             # LZMA is available in Python 2 only if backports.lzma is installed
             # Python 3 supports it by default
             assert lzma_present, 'LZMA compression is unavailable.'
             self.fp = lzma.open(name, mode=mode + 't')
+        else:  # self.ctype == 'zstd'
+            # Zstandard is available only in Python 3.14 and later
+            assert zstd_present, 'Zstandard compression is unavailable.'
+            self.fp = zstd.open(name, mode=mode + 't')
 
     def close(self):
         """
@@ -175,6 +189,8 @@ class FileObject(object):
             self.ctype = 'bzip2'
         elif ext in ('.xz', '.lzma'):
             self.ctype = 'lzma'
+        elif ext == 'zst':
+            self.ctype = 'zstd'
         else:
             self.ctype = None