mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-12 12:08:18 +00:00
Code Activity

fix #2076, add option to handle .cnf files into dimacs parser

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2019-01-09 15:43:45 -08:00
parent b63a0e31d3
commit 9c318ed304
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/api/api_solver.cpp
View file

@ -181,7 +181,7 @@ extern "C" {
if (!is) { if (!is) {
SET_ERROR_CODE(Z3_FILE_ACCESS_ERROR, nullptr); SET_ERROR_CODE(Z3_FILE_ACCESS_ERROR, nullptr);
} }
else if (ext && std::string("dimacs") == ext) { else if (ext && (std::string("dimacs") == ext || std::string("cnf") == ext)) {
ast_manager& m = to_solver_ref(s)->get_manager(); ast_manager& m = to_solver_ref(s)->get_manager();
std::stringstream err; std::stringstream err;
sat::solver solver(to_solver_ref(s)->get_params(), m.limit()); sat::solver solver(to_solver_ref(s)->get_params(), m.limit());

7
src/smt/theory_pb.cpp
View file

@ -1197,8 +1197,11 @@ namespace smt {
literal_vector& lits = get_unhelpful_literals(c, true); literal_vector& lits = get_unhelpful_literals(c, true);
lits.push_back(c.lit()); lits.push_back(c.lit());
for (unsigned i = 0; i < sz; ++i) { for (unsigned i = 0; i < sz; ++i) {
DEBUG_CODE(validate_assign(c, lits, c.lit(i));); literal lit = c.lit(i);
add_assign(c, lits, c.lit(i)); if (ctx.get_assignment(lit) == l_undef) {
DEBUG_CODE(validate_assign(c, lits, lit););
add_assign(c, lits, c.lit(i));
}
} }
} }
} }