python-sat 1.9.dev6__tar.gz → 1.9.dev8__tar.gz

{python_sat-1.9.dev6/python_sat.egg-info → python_sat-1.9.dev8}/PKG-INFO

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

@@ -134,7 +134,6 @@ from __future__ import print_function
 import bisect
 import collections
 import getopt
-import itertools
 from math import copysign
 import os
 from pysat.formula import CNFPlus, WCNFPlus, IDPool
@@ -740,9 +739,12 @@ class RC2(object):
             self.minw = min(map(lambda l: self.wght[l], self.core))
 
             # dividing the core into two parts
-            iter1, iter2 = itertools.tee(self.core)
-            self.core_sels = list(l for l in iter1 if l in self.sels_set)
-            self.core_sums = list(l for l in iter2 if l not in self.sels_set)
+            self.core_sels, self.core_sums = [], []
+            for l in self.core:
+                if l in self.sels_set:
+                    self.core_sels.append(l)
+                else:
+                    self.core_sums.append(l)
 
     def process_core(self):
         """

{python_sat-1.9.dev6 → python_sat-1.9.dev8}/formula/pf_parse.cc

@@ -47,10 +47,14 @@ PyObject *parse_cnf_impl(PyObject *txt_obj, PyObject *comment_lead)
 			continue;
 
 		if (comment_mask[(unsigned char)beg[0]]) {
-			if (!line_starts(beg, lend, "p cnf ")) {
-				if (!append_comment(comments, beg, lend))
-					goto fail;
+			if (line_has_kind(beg, lend, "cnf"))
+				continue;
+			if (line_has_p(beg, lend)) {
+				PyErr_SetString(PyExc_ValueError, "invalid CNF preamble");
+				goto fail;
 			}
+			if (!append_comment(comments, beg, lend))
+				goto fail;
 			continue;
 		}
 
@@ -143,13 +147,17 @@ PyObject *parse_wcnf_impl(PyObject *txt_obj, PyObject *comment_lead)
 			continue;
 
 		if (comment_mask[(unsigned char)beg[0]]) {
-			if (!line_starts(beg, lend, "p wcnf ")) {
-				if (!append_comment(comments, beg, lend))
+			if (line_has_kind(beg, lend, "wcnf")) {
+				if (!parse_weight_preamble(beg, lend,
+						"invalid WCNF preamble", &topw))
 					goto fail;
 			}
+			else if (line_has_p(beg, lend)) {
+				PyErr_SetString(PyExc_ValueError, "invalid WCNF preamble");
+				goto fail;
+			}
 			else {
-				if (!parse_weight_preamble(beg, lend, "wcnf",
-						"invalid WCNF preamble", &topw))
+				if (!append_comment(comments, beg, lend))
 					goto fail;
 			}
 			continue;
@@ -249,10 +257,15 @@ PyObject *parse_cnfplus_impl(PyObject *txt_obj, PyObject *comment_lead)
 			continue;
 
 		if (comment_mask[(unsigned char)beg[0]]) {
-			if (!line_starts(beg, lend, "p cnf+")) {
-				if (!append_comment(comments, beg, lend))
-					goto fail;
+			if (line_has_kind(beg, lend, "cnf", "cnf+"))
+				continue;
+			if (line_has_p(beg, lend)) {
+				PyErr_SetString(PyExc_ValueError, "invalid CNF/CNF+ preamble");
+				goto fail;
 			}
+
+			if (!append_comment(comments, beg, lend))
+				goto fail;
 			continue;
 		}
 
@@ -366,13 +379,18 @@ PyObject *parse_wcnfplus_impl(PyObject *txt_obj, PyObject *comment_lead)
 			continue;
 
 		if (comment_mask[(unsigned char)beg[0]]) {
-			if (!line_starts(beg, lend, "p wcnf+")) {
-				if (!append_comment(comments, beg, lend))
+			if (line_has_kind(beg, lend, "wcnf", "wcnf+")) {
+				if (!parse_weight_preamble(beg, lend,
+						"invalid WCNF/WCNF+ preamble", &topw))
 					goto fail;
 			}
+			else if (line_has_p(beg, lend)) {
+				PyErr_SetString(PyExc_ValueError,
+						"invalid WCNF/WCNF+ preamble");
+				goto fail;
+			}
 			else {
-				if (!parse_weight_preamble(beg, lend, "wcnf+",
-						"invalid WCNF+ preamble", &topw))
+				if (!append_comment(comments, beg, lend))
 					goto fail;
 			}
 			continue;

{python_sat-1.9.dev6 → python_sat-1.9.dev8}/formula/pf_scan.hh

@@ -83,6 +83,32 @@ static inline bool read_span(const char * &p, const char *end,
 	return true;
 }
 
+// check whether a line starts with the exact DIMACS preamble marker
+//=============================================================================
+static inline bool line_has_p(const char *beg, const char *end)
+{
+	const char *p = beg;
+	const char *tbeg, *tend;
+
+	return read_span(p, end, tbeg, tend) && span_eq(tbeg, tend, "p");
+}
+
+// check whether a line has an exact DIMACS preamble kind token
+//=============================================================================
+static inline bool line_has_kind(const char *beg, const char *end,
+		const char *kind1, const char *kind2 = NULL)
+{
+	const char *p = beg;
+	const char *tbeg, *tend;
+
+	if (!read_span(p, end, tbeg, tend) || !span_eq(tbeg, tend, "p") ||
+			!read_span(p, end, tbeg, tend))
+		return false;
+
+	return span_eq(tbeg, tend, kind1) ||
+		(kind2 != NULL && span_eq(tbeg, tend, kind2));
+}
+
 // check whether a span has the syntax of a signed integer
 //=============================================================================
 static inline bool span_is_integer_like(const char *beg, const char *end)

{python_sat-1.9.dev6 → python_sat-1.9.dev8}/formula/pf_weight.cc

@@ -13,13 +13,14 @@
 // parse only the weighted preamble fields relevant to the native parser
 //=============================================================================
 bool parse_weight_preamble(const char *beg, const char *end,
-		const char *kind, const char *errmsg, PyObject **topw)
+		const char *errmsg, PyObject **topw)
 {
 	const char *p = beg;
 	const char *tbeg, *tend;
 
 	if (!read_span(p, end, tbeg, tend) || !span_eq(tbeg, tend, "p") ||
-			!read_span(p, end, tbeg, tend) || !span_eq(tbeg, tend, kind) ||
+			!read_span(p, end, tbeg, tend) ||
+			!(span_eq(tbeg, tend, "wcnf") || span_eq(tbeg, tend, "wcnf+")) ||
 			!read_span(p, end, tbeg, tend) ||
 			!read_span(p, end, tbeg, tend)) {
 		PyErr_SetString(PyExc_ValueError, errmsg);

{python_sat-1.9.dev6 → python_sat-1.9.dev8}/formula/pyformula.hh

@@ -76,7 +76,7 @@ typedef struct {
 	vector<long long> wght;
 } plus_body;
 
-bool parse_weight_preamble(const char *beg, const char *end, const char *kind,
+bool parse_weight_preamble(const char *beg, const char *end,
 		const char *errmsg, PyObject **topw);
 
 bool parse_clause_body(const char *p, const char *end,

{python_sat-1.9.dev6 → python_sat-1.9.dev8}/pysat/__init__.py

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