python-sat 1.8.dev14__tar.gz → 1.8.dev15__tar.gz

{python_sat-1.8.dev14/python_sat.egg-info → python-sat-1.8.dev15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-sat
-Version: 1.8.dev14
+Version: 1.8.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.8.dev14 → python-sat-1.8.dev15}/README.rst

@@ -348,6 +348,16 @@ publication, please, acknowledge that fact by citing PySAT:
       doi       = {10.1007/978-3-319-94144-8_26}
     }
 
+    @inproceedings{itk-sat24,
+      author    = {Alexey Ignatiev and Zi Li Tan and Christos Karamanos},
+      title     = {Towards Universally Accessible {SAT} Technology},
+      booktitle = {SAT},
+      pages     = {4:1--4:11},
+      year      = {2024},
+      url       = {https://doi.org/10.4230/LIPIcs.SAT.2024.16},
+      doi       = {10.4230/LIPICS.SAT.2024.16},
+    }
+
 To-Do
 -----
 

{python_sat-1.8.dev14 → python-sat-1.8.dev15}/pysat/__init__.py

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

{python_sat-1.8.dev14 → python-sat-1.8.dev15}/pysat/formula.py

@@ -1169,7 +1169,8 @@ class Formula(object):
 
         # then recursively iterate through the clauses
         for cl in self._iter(outermost=True):
-            yield cl
+            if PYSAT_TRUE.name not in cl:
+                yield list(filter(lambda x: x != PYSAT_FALSE.name, cl))
 
     def clausify(self):
         """
@@ -1451,6 +1452,8 @@ class Atom(Formula):
 #==============================================================================
 Formula.set_context('_global')
 PYSAT_FALSE, PYSAT_TRUE = Atom(False), Atom(True)
+PYSAT_FALSE.name, PYSAT_TRUE.name = -0.5, 0.5 # special (floating-point) values for the constants
+                                              # different from all variable names
 Formula.set_context('default')
 
 

{python_sat-1.8.dev14 → python-sat-1.8.dev15}/pysat/solvers.py

@@ -494,10 +494,13 @@ class Solver(object):
 
     def configure(self, parameters):
         """
-            Configure :class:`Cadical153` or :class:`Cadical195` by setting
-            some of the predefined parameters to selected values. Note that
-            this method can be invoked only for :class:`Cadical153` and
-            `Cadical195` -- no other solvers support this for now.
+            Configure :class:`Cadical153`, :class:`Cadical195`, and also
+            :class:`Glucose42` by setting some of the predefined parameters to
+            selected values. Note that this method is supposed to be invoked
+            only for :class:`Cadical153` and `Cadical195` -- no other solvers
+            support this for now. (Additionally, one can use it to set some of
+            the randomness related parameters in Glucose42. No other options
+            can be set for Glucose42.)
 
             Also note that this call must follow the creation of the new
             solver object; otherwise, an exception may be thrown.
@@ -507,11 +510,23 @@ class Solver(object):
             assigned to is provided `here
             <https://github.com/arminbiere/cadical/blob/master/src/options.hpp>`__.
 
-            :param parameters: parameter names mapped to integer values
+            The list of available options of :class:`Glucose42` includes:
+
+                * ``rnd-seed``: random seed (integer)
+
+                * ``rnd-freq``: frequency of random decisions (float, 0 <= value <= 1)
+
+                * ``rnd-init-act``: random initial activities (bool)
+
+                * ``rnd-pol``: random variable polarities when branching (bool)
+
+                * ``rnd-first-descent``: random decisions before the first conflic (bool)
+
+            :param parameters: parameter names mapped to integer/boolean/floating-point values
             :type parameters: dict
         """
 
-        if self.solver and type(self.solver) in (Cadical153, Cadical195):
+        if self.solver and type(self.solver) in (Cadical153, Cadical195, Glucose42):
             self.solver.configure(parameters)
 
     def activate_atmost(self):
@@ -4358,6 +4373,94 @@ class Glucose42(object):
         if self.glucose:
             pysolvers.glucose421_setphases(self.glucose, literals)
 
+    def configure(self, parameters):
+        """
+            Configure randomness-related parameters of the solver. Parameters
+            should be passed as a dictionary ``{"name": value}``. The list of
+            available parameters includes:
+
+                * ``rnd-seed``: random seed (integer)
+
+                * ``rnd-freq``: frequency of random decisions (float, 0 <= value <= 1)
+
+                * ``rnd-init-act``: random initial activities (bool)
+
+                * ``rnd-pol``: random variable polarities when branching (bool)
+
+                * ``rnd-first-descent``: random decisions before the first conflic (bool)
+
+            :param parameters: parameter names mapped to integer/boolean/floating-point values
+            :type parameters: dict
+        """
+
+        # we aren't checking if the solver object exists
+        # because it is done in all the option setters
+        if 'rnd-seed' in parameters:
+            self.set_rnd_seed(parameters['rnd-seed'])
+        elif 'rnd-freq' in parameters:
+            self.set_rnd_freq(parameters['rnd-freq'])
+        elif 'rnd-pol' in parameters:
+            self.set_rnd_pol(parameters['rnd-pol'])
+        elif 'rnd-init-act' in parameters:
+            self.set_rnd_init_act(parameters['rnd-init-act'])
+        elif 'rnd-first-descent' in parameters:
+            self.set_rnd_first_descent(parameters['rnd-first-descent'])
+
+    def set_rnd_seed(self, seed):
+        """
+            Sets the seed for the solver's PRNG.
+
+            :param seed: Random seed value to initialise the solver's PRNG.
+            :type seed: int
+        """
+
+        if self.glucose:
+            pysolvers.glucose421_set_rnd_seed(self.glucose, seed)
+
+    def set_rnd_freq(self, freq):
+        """
+            Sets the frequency of random decisions.
+
+            :param freq: Frequency value, must be within :math:`[0, 1]`
+            :type seed: float
+        """
+
+        if self.glucose:
+            pysolvers.glucose421_set_rnd_freq(self.glucose, freq)
+
+    def set_rnd_pol(self, to_enable):
+        """
+            Enables/disables random polarities, to be used when branching.
+
+            :param to_enable: If True, the solver will use random polarities
+            :type to_enable: bool
+        """
+
+        if self.glucose:
+            pysolvers.glucose421_set_rnd_pol(self.glucose, to_enable)
+
+    def set_rnd_init_act(self, to_enable):
+        """
+            Enables/disables random values for initial variable activities.
+
+            :param to_enable: If True, the solver will randomly initialise variable activities
+            :type to_enable: bool
+        """
+
+        if self.glucose:
+            pysolvers.glucose421_set_rnd_init_act(self.glucose, to_enable)
+
+    def set_rnd_first_descent(self, to_enable):
+        """
+            Sets the solver's behaviour during the first descent.
+
+            :param to_enable: If True, the solver will make random decision until the first conflict
+            :type to_enable: bool
+        """
+
+        if self.glucose:
+            pysolvers.glucose421_set_rnd_first_descent(self.glucose, to_enable)
+
     def get_status(self):
         """
             Returns solver's status.

{python_sat-1.8.dev14 → python-sat-1.8.dev15/python_sat.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-sat
-Version: 1.8.dev14
+Version: 1.8.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.8.dev14 → python-sat-1.8.dev15}/solvers/pysolvers.cc

@@ -136,6 +136,19 @@ static char    vreset_docstring[] = "Remove all the 'observed' variable flags"
                                     "(CaDiCaL 1.9.5 only).";
 static char  isdeclit_docstring[] = "Get reason of valid observed literal "
                                     "(CaDiCaL 1.9.5 only).";
+static char  set_rnd_seed_docstring[] =          "Set PNRG seed "
+                                                 "(Glucose 4.2.1 only).";
+static char  set_rnd_freq_docstring[] =          "Set frequency of random decisions "
+                                                 "(Glucose 4.2.1 only).";
+static char  set_rnd_pol_docstring[] =           "Randomize polarities on branching "
+                                                 "(Glucose 4.2.1 only).";
+static char  set_rnd_init_act_docstring[] =      "Randomize initial activities "
+                                                 "(Glucose 4.2.1 only).";
+static char  set_rnd_first_descent_docstring[] = "Randomize decisions until first conflict "
+                                                 "(Glucose 4.2.1 only).";
+
+
+
 
 static PyObject *SATError;
 static jmp_buf env;
@@ -294,25 +307,30 @@ extern "C" {
 	static PyObject *py_glucose41_acc_stats (PyObject *, PyObject *);
 #endif
 #ifdef WITH_GLUCOSE421
-	static PyObject *py_glucose421_new       (PyObject *, PyObject *);
-	static PyObject *py_glucose421_set_start (PyObject *, PyObject *);
-	static PyObject *py_glucose421_add_cl    (PyObject *, PyObject *);
-	static PyObject *py_glucose421_solve     (PyObject *, PyObject *);
-	static PyObject *py_glucose421_solve_lim (PyObject *, PyObject *);
-	static PyObject *py_glucose421_propagate (PyObject *, PyObject *);
-	static PyObject *py_glucose421_setphases (PyObject *, PyObject *);
-	static PyObject *py_glucose421_cbudget   (PyObject *, PyObject *);
-	static PyObject *py_glucose421_pbudget   (PyObject *, PyObject *);
-	static PyObject *py_glucose421_interrupt (PyObject *, PyObject *);
-	static PyObject *py_glucose421_clearint  (PyObject *, PyObject *);
-	static PyObject *py_glucose421_setincr   (PyObject *, PyObject *);
-	static PyObject *py_glucose421_tracepr   (PyObject *, PyObject *);
-	static PyObject *py_glucose421_core      (PyObject *, PyObject *);
-	static PyObject *py_glucose421_model     (PyObject *, PyObject *);
-	static PyObject *py_glucose421_nof_vars  (PyObject *, PyObject *);
-	static PyObject *py_glucose421_nof_cls   (PyObject *, PyObject *);
-	static PyObject *py_glucose421_del       (PyObject *, PyObject *);
-	static PyObject *py_glucose421_acc_stats (PyObject *, PyObject *);
+	static PyObject *py_glucose421_new                   (PyObject *, PyObject *);
+	static PyObject *py_glucose421_set_start             (PyObject *, PyObject *);
+	static PyObject *py_glucose421_add_cl                (PyObject *, PyObject *);
+	static PyObject *py_glucose421_solve                 (PyObject *, PyObject *);
+	static PyObject *py_glucose421_solve_lim             (PyObject *, PyObject *);
+	static PyObject *py_glucose421_propagate             (PyObject *, PyObject *);
+	static PyObject *py_glucose421_setphases             (PyObject *, PyObject *);
+	static PyObject *py_glucose421_cbudget               (PyObject *, PyObject *);
+	static PyObject *py_glucose421_pbudget               (PyObject *, PyObject *);
+	static PyObject *py_glucose421_interrupt             (PyObject *, PyObject *);
+	static PyObject *py_glucose421_clearint              (PyObject *, PyObject *);
+	static PyObject *py_glucose421_setincr               (PyObject *, PyObject *);
+	static PyObject *py_glucose421_tracepr               (PyObject *, PyObject *);
+	static PyObject *py_glucose421_core                  (PyObject *, PyObject *);
+	static PyObject *py_glucose421_model                 (PyObject *, PyObject *);
+	static PyObject *py_glucose421_nof_vars              (PyObject *, PyObject *);
+	static PyObject *py_glucose421_nof_cls               (PyObject *, PyObject *);
+	static PyObject *py_glucose421_del                   (PyObject *, PyObject *);
+	static PyObject *py_glucose421_acc_stats             (PyObject *, PyObject *);
+	static PyObject *py_glucose421_set_rnd_seed          (PyObject *, PyObject *);
+	static PyObject *py_glucose421_set_rnd_freq          (PyObject *, PyObject *);
+	static PyObject *py_glucose421_set_rnd_pol           (PyObject *, PyObject *);
+	static PyObject *py_glucose421_set_rnd_init_act      (PyObject *, PyObject *);
+	static PyObject *py_glucose421_set_rnd_first_descent (PyObject *, PyObject *);
 #endif
 #ifdef WITH_LINGELING
 	static PyObject *py_lingeling_new       (PyObject *, PyObject *);
@@ -618,25 +636,30 @@ static PyMethodDef module_methods[] = {
 	{ "glucose41_acc_stats", py_glucose41_acc_stats, METH_VARARGS,  acc_stat_docstring },
 #endif
 #ifdef WITH_GLUCOSE421
-	{ "glucose421_new",       py_glucose421_new,       METH_VARARGS,       new_docstring },
-	{ "glucose421_set_start", py_glucose421_set_start, METH_VARARGS,  setstart_docstring },
-	{ "glucose421_add_cl",    py_glucose421_add_cl,    METH_VARARGS,     addcl_docstring },
-	{ "glucose421_solve",     py_glucose421_solve,     METH_VARARGS,     solve_docstring },
-	{ "glucose421_solve_lim", py_glucose421_solve_lim, METH_VARARGS,       lim_docstring },
-	{ "glucose421_propagate", py_glucose421_propagate, METH_VARARGS,      prop_docstring },
-	{ "glucose421_setphases", py_glucose421_setphases, METH_VARARGS,    phases_docstring },
-	{ "glucose421_cbudget",   py_glucose421_cbudget,   METH_VARARGS,   cbudget_docstring },
-	{ "glucose421_pbudget",   py_glucose421_pbudget,   METH_VARARGS,   pbudget_docstring },
-	{ "glucose421_interrupt", py_glucose421_interrupt, METH_VARARGS, interrupt_docstring },
-	{ "glucose421_clearint",  py_glucose421_clearint,  METH_VARARGS,  clearint_docstring },
-	{ "glucose421_setincr",   py_glucose421_setincr,   METH_VARARGS,   setincr_docstring },
-	{ "glucose421_tracepr",   py_glucose421_tracepr,   METH_VARARGS,   tracepr_docstring },
-	{ "glucose421_core",      py_glucose421_core,      METH_VARARGS,      core_docstring },
-	{ "glucose421_model",     py_glucose421_model,     METH_VARARGS,     model_docstring },
-	{ "glucose421_nof_vars",  py_glucose421_nof_vars,  METH_VARARGS,     nvars_docstring },
-	{ "glucose421_nof_cls",   py_glucose421_nof_cls,   METH_VARARGS,      ncls_docstring },
-	{ "glucose421_del",       py_glucose421_del,       METH_VARARGS,       del_docstring },
-	{ "glucose421_acc_stats", py_glucose421_acc_stats, METH_VARARGS,  acc_stat_docstring },
+	{ "glucose421_new",                   py_glucose421_new,                   METH_VARARGS,                    new_docstring },
+	{ "glucose421_set_start",             py_glucose421_set_start,             METH_VARARGS,               setstart_docstring },
+	{ "glucose421_add_cl",                py_glucose421_add_cl,                METH_VARARGS,                  addcl_docstring },
+	{ "glucose421_solve",                 py_glucose421_solve,                 METH_VARARGS,                  solve_docstring },
+	{ "glucose421_solve_lim",             py_glucose421_solve_lim,             METH_VARARGS,                    lim_docstring },
+	{ "glucose421_propagate",             py_glucose421_propagate,             METH_VARARGS,                   prop_docstring },
+	{ "glucose421_setphases",             py_glucose421_setphases,             METH_VARARGS,                 phases_docstring },
+	{ "glucose421_cbudget",               py_glucose421_cbudget,               METH_VARARGS,                cbudget_docstring },
+	{ "glucose421_pbudget",               py_glucose421_pbudget,               METH_VARARGS,                pbudget_docstring },
+	{ "glucose421_interrupt",             py_glucose421_interrupt,             METH_VARARGS,              interrupt_docstring },
+	{ "glucose421_clearint",              py_glucose421_clearint,              METH_VARARGS,               clearint_docstring },
+	{ "glucose421_setincr",               py_glucose421_setincr,               METH_VARARGS,                setincr_docstring },
+	{ "glucose421_tracepr",               py_glucose421_tracepr,               METH_VARARGS,                tracepr_docstring },
+	{ "glucose421_core",                  py_glucose421_core,                  METH_VARARGS,                   core_docstring },
+	{ "glucose421_model",                 py_glucose421_model,                 METH_VARARGS,                  model_docstring },
+	{ "glucose421_nof_vars",              py_glucose421_nof_vars,              METH_VARARGS,                  nvars_docstring },
+	{ "glucose421_nof_cls",               py_glucose421_nof_cls,               METH_VARARGS,                   ncls_docstring },
+	{ "glucose421_del",                   py_glucose421_del,                   METH_VARARGS,                    del_docstring },
+	{ "glucose421_acc_stats",             py_glucose421_acc_stats,             METH_VARARGS,               acc_stat_docstring },
+	{ "glucose421_set_rnd_seed",          py_glucose421_set_rnd_seed,          METH_VARARGS,           set_rnd_seed_docstring },
+	{ "glucose421_set_rnd_freq",          py_glucose421_set_rnd_freq,          METH_VARARGS,           set_rnd_freq_docstring },
+	{ "glucose421_set_rnd_pol",           py_glucose421_set_rnd_pol,           METH_VARARGS,            set_rnd_pol_docstring },
+	{ "glucose421_set_rnd_init_act",      py_glucose421_set_rnd_init_act,      METH_VARARGS,       set_rnd_init_act_docstring },
+	{ "glucose421_set_rnd_first_descent", py_glucose421_set_rnd_first_descent, METH_VARARGS,  set_rnd_first_descent_docstring },
 #endif
 #ifdef WITH_LINGELING
 	{ "lingeling_new",       py_lingeling_new,       METH_VARARGS,      new_docstring },
@@ -5837,7 +5860,6 @@ static PyObject *py_glucose421_new(PyObject *self, PyObject *args)
 				"Cannot create a new solver.");
 		return NULL;
 	}
-
 	return void_to_pyobj((void *)s);
 }
 
@@ -6205,6 +6227,96 @@ static PyObject *py_glucose421_setincr(PyObject *self, PyObject *args)
 	Py_RETURN_NONE;
 }
 
+//
+//=============================================================================
+static PyObject *py_glucose421_set_rnd_seed(PyObject *self, PyObject *args)
+{
+	PyObject *s_obj;
+	double dbl;
+
+	if (!PyArg_ParseTuple(args, "Od", &s_obj, &dbl))
+		return NULL;
+
+	// get pointer to solver
+	Glucose421::Solver *s = (Glucose421::Solver *)pyobj_to_void(s_obj);
+	
+	s->random_seed = dbl;
+
+	Py_RETURN_NONE;
+}
+
+//
+//=============================================================================
+static PyObject *py_glucose421_set_rnd_freq(PyObject *self, PyObject *args)
+{
+	PyObject *s_obj;
+	double dbl;
+
+	if (!PyArg_ParseTuple(args, "Od", &s_obj, &dbl))
+		return NULL;
+
+	// get pointer to solver
+	Glucose421::Solver *s = (Glucose421::Solver *)pyobj_to_void(s_obj);
+	
+	s->random_var_freq = dbl;
+
+	Py_RETURN_NONE;
+}
+
+//
+//=============================================================================
+static PyObject *py_glucose421_set_rnd_pol(PyObject *self, PyObject *args)
+{
+	PyObject *s_obj;
+	int b;
+
+	if (!PyArg_ParseTuple(args, "Op", &s_obj, &b))
+		return NULL;
+
+	// get pointer to solver
+	Glucose421::Solver *s = (Glucose421::Solver *)pyobj_to_void(s_obj);
+	
+	s->rnd_pol = (bool) b;
+
+	Py_RETURN_NONE;
+}
+
+//
+//=============================================================================
+static PyObject *py_glucose421_set_rnd_init_act(PyObject *self, PyObject *args)
+{
+	PyObject *s_obj;
+	int b;
+
+	if (!PyArg_ParseTuple(args, "Op", &s_obj, &b))
+		return NULL;
+
+	// get pointer to solver
+	Glucose421::Solver *s = (Glucose421::Solver *)pyobj_to_void(s_obj);
+	
+	s->rnd_init_act = (bool) b;
+
+	Py_RETURN_NONE;
+}
+
+//
+//=============================================================================
+static PyObject *py_glucose421_set_rnd_first_descent(PyObject *self, PyObject *args)
+{
+	PyObject *s_obj;
+	int b;
+
+	if (!PyArg_ParseTuple(args, "Op", &s_obj, &b))
+		return NULL;
+
+	// get pointer to solver
+	Glucose421::Solver *s = (Glucose421::Solver *)pyobj_to_void(s_obj);
+	
+	s->randomizeFirstDescent = (bool) b;
+
+	Py_RETURN_NONE;
+}
+
 //
 //=============================================================================
 static PyObject *py_glucose421_tracepr(PyObject *self, PyObject *args)