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

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

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

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

{python_sat-1.9.dev6 → python_sat-1.9.dev7}/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.dev6 → python_sat-1.9.dev7/python_sat.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-sat
-Version: 1.9.dev6
+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.dev7/tests/test_formula_parsing.py

@@ -0,0 +1,143 @@
+from io import StringIO
+from decimal import Decimal
+
+import pytest
+import pysat.formula as formula_mod
+from pysat.formula import CNF, WCNF, CNFPlus, WCNFPlus
+
+
+def test_cnf_parser_comments_and_clauses():
+    s = 'c hello\np cnf 3 2\n-1 2 0\n3 0\n'
+    cnf = CNF(from_string=s)
+
+    assert cnf.comments == ['c hello']
+    assert cnf.clauses == [[-1, 2], [3]]
+    assert cnf.nv == 3
+
+
+def test_cnf_parser_from_fp():
+    fp = StringIO('c note\np cnf 2 1\n1 -2 0\n')
+    cnf = CNF(from_fp=fp)
+
+    assert cnf.comments == ['c note']
+    assert cnf.clauses == [[1, -2]]
+    assert cnf.nv == 2
+
+
+def test_wcnf_parser_decimal_and_negative_weights():
+    s = 'c weighted\np wcnf 3 3 10\n10 -1 2 0\n3.5 1 0\n-2 -3 0\n'
+    wcnf = WCNF(from_string=s)
+
+    assert wcnf.comments == ['c weighted']
+    assert wcnf.hard == [[-1, 2]]
+    assert wcnf.soft == [[1], [3]]
+    assert wcnf.wght == [Decimal('3.5'), 2]
+    assert wcnf.topw == 10
+    assert wcnf.nv == 3
+
+
+def test_cnfplus_parser_pb_and_cardinality():
+    s = 'c plus\np cnf+ 5 3\n1 -2 3 0\n1 2 3 <= 1\nw 2*1 3*-4 1*5 >= 3\n'
+    cnf = CNFPlus(from_string=s)
+
+    assert cnf.comments == ['c plus']
+    assert cnf.clauses == [[1, -2, 3]]
+    assert cnf.atmosts == [
+        [[1, 2, 3], 1],
+        [[-1, 4, -5], 3, [2, 3, 1]],
+    ]
+    assert cnf.nv == 5
+
+
+def test_wcnfplus_parser_hard_soft_and_pb():
+    s = (
+        'c wplus\n'
+        'p wcnf+ 5 4 10\n'
+        '10 1 -2 0\n'
+        '2.5 3 0\n'
+        'h 1 2 3 <= 1\n'
+        'h w 2*1 3*-4 1*5 >= 3\n'
+    )
+    wcnf = WCNFPlus(from_string=s)
+
+    assert wcnf.comments == ['c wplus']
+    assert wcnf.hard == [[1, -2]]
+    assert wcnf.soft == [[3]]
+    assert wcnf.wght == [Decimal('2.5')]
+    assert wcnf.atms == [
+        [[1, 2, 3], 1],
+        [[-1, 4, -5], 3, [2, 3, 1]],
+    ]
+    assert wcnf.topw == 10
+    assert wcnf.nv == 5
+
+
+def test_cnfplus_parser_accepts_plain_cnf_preamble():
+    s = 'c plain\np cnf 3 2\n1 0\n-2 3 0\n'
+    cnf = CNFPlus(from_string=s)
+
+    assert cnf.comments == ['c plain']
+    assert cnf.clauses == [[1], [-2, 3]]
+    assert cnf.atmosts == []
+    assert cnf.nv == 3
+
+
+def test_wcnfplus_parser_accepts_plain_wcnf_preamble():
+    s = 'c plain\np wcnf 3 3 5\n5 1 0\n1 -2 0\n2 3 0\n'
+    wcnf = WCNFPlus(from_string=s)
+
+    assert wcnf.comments == ['c plain']
+    assert wcnf.hard == [[1]]
+    assert wcnf.soft == [[-2], [3]]
+    assert wcnf.wght == [1, 2]
+    assert wcnf.atms == []
+    assert wcnf.topw == 5
+    assert wcnf.nv == 3
+
+
+def test_invalid_preamble_lines_raise_errors():
+    with pytest.raises(ValueError, match='invalid CNF/CNF\\+ preamble'):
+        CNFPlus(from_string='c x\np bullshit\np cnf 2 1\n1 0\n')
+
+    with pytest.raises(ValueError, match='invalid CNF/CNF\\+ preamble'):
+        CNFPlus(from_string='p cnfxyz\np cnf 2 1\n1 0\n')
+
+    with pytest.raises(ValueError, match='invalid WCNF/WCNF\\+ preamble'):
+        WCNFPlus(from_string='c y\np nonsense\np wcnf 2 1 5\n5 1 0\n')
+
+    with pytest.raises(ValueError, match='invalid WCNF/WCNF\\+ preamble'):
+        WCNFPlus(from_string='p wcnfxyz\np wcnf 2 1 5\n5 1 0\n')
+
+
+def test_python_wcnfplus_negative_normalization_keeps_nv():
+    old = formula_mod.pyformula_present
+    formula_mod.pyformula_present = False
+
+    try:
+        s = 'p wcnf 4 3 10\n10 1 0\n3.5 -2 0\n-2 3 0\n'
+        wcnf = WCNFPlus(from_string=s)
+    finally:
+        formula_mod.pyformula_present = old
+
+    assert wcnf.hard == [[1]]
+    assert wcnf.soft == [[-2], [-3]]
+    assert wcnf.wght == [Decimal('3.5'), 2]
+    assert wcnf.topw == 10
+    assert wcnf.nv == 3
+
+
+def test_python_wcnf_negative_normalization_counts_aux_var():
+    old = formula_mod.pyformula_present
+    formula_mod.pyformula_present = False
+
+    try:
+        s = 'p wcnf 5 2 10\n10 1 0\n-2 4 5 0\n'
+        wcnf = WCNF(from_string=s)
+    finally:
+        formula_mod.pyformula_present = old
+
+    assert wcnf.soft == [[-6]]
+    assert wcnf.wght == [2]
+    assert sorted(wcnf.hard) == sorted([[1], [6, -4], [6, -5], [-6, 4, 5]])
+    assert wcnf.topw == 10
+    assert wcnf.nv == 6

python_sat-1.9.dev6/tests/test_formula_parsing.py

@@ -1,70 +0,0 @@
-from io import StringIO
-from decimal import Decimal
-
-from pysat.formula import CNF, WCNF, CNFPlus, WCNFPlus
-
-
-def test_cnf_parser_comments_and_clauses():
-    s = 'c hello\np cnf 3 2\n-1 2 0\n3 0\n'
-    cnf = CNF(from_string=s)
-
-    assert cnf.comments == ['c hello']
-    assert cnf.clauses == [[-1, 2], [3]]
-    assert cnf.nv == 3
-
-
-def test_cnf_parser_from_fp():
-    fp = StringIO('c note\np cnf 2 1\n1 -2 0\n')
-    cnf = CNF(from_fp=fp)
-
-    assert cnf.comments == ['c note']
-    assert cnf.clauses == [[1, -2]]
-    assert cnf.nv == 2
-
-
-def test_wcnf_parser_decimal_and_negative_weights():
-    s = 'c weighted\np wcnf 3 3 10\n10 -1 2 0\n3.5 1 0\n-2 -3 0\n'
-    wcnf = WCNF(from_string=s)
-
-    assert wcnf.comments == ['c weighted']
-    assert wcnf.hard == [[-1, 2]]
-    assert wcnf.soft == [[1], [3]]
-    assert wcnf.wght == [Decimal('3.5'), 2]
-    assert wcnf.topw == 10
-    assert wcnf.nv == 3
-
-
-def test_cnfplus_parser_pb_and_cardinality():
-    s = 'c plus\np cnf+ 5 3\n1 -2 3 0\n1 2 3 <= 1\nw 2*1 3*-4 1*5 >= 3\n'
-    cnf = CNFPlus(from_string=s)
-
-    assert cnf.comments == ['c plus']
-    assert cnf.clauses == [[1, -2, 3]]
-    assert cnf.atmosts == [
-        [[1, 2, 3], 1],
-        [[-1, 4, -5], 3, [2, 3, 1]],
-    ]
-    assert cnf.nv == 5
-
-
-def test_wcnfplus_parser_hard_soft_and_pb():
-    s = (
-        'c wplus\n'
-        'p wcnf+ 5 4 10\n'
-        '10 1 -2 0\n'
-        '2.5 3 0\n'
-        'h 1 2 3 <= 1\n'
-        'h w 2*1 3*-4 1*5 >= 3\n'
-    )
-    wcnf = WCNFPlus(from_string=s)
-
-    assert wcnf.comments == ['c wplus']
-    assert wcnf.hard == [[1, -2]]
-    assert wcnf.soft == [[3]]
-    assert wcnf.wght == [Decimal('2.5')]
-    assert wcnf.atms == [
-        [[1, 2, 3], 1],
-        [[-1, 4, -5], 3, [2, 3, 1]],
-    ]
-    assert wcnf.topw == 10
-    assert wcnf.nv == 5