mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 01:25:31 +00:00
Code Activity

bug fixes, prepare for retaining blocked clauses

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-10-19 22:19:05 -07:00
parent 636f740b1a
commit 76eed064eb
16 changed files with 333 additions and 234 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/shell/dimacs_frontend.cpp
View file

@ -21,9 +21,9 @@ Revision History:
#include<signal.h>
#include "util/timeout.h"
#include "util/rlimit.h"
#include "util/gparams.h"
#include "sat/dimacs.h"
#include "sat/sat_solver.h"
#include "util/gparams.h"
extern bool g_display_statistics;
static sat::solver * g_solver = 0;
@ -126,6 +126,42 @@ static void track_clauses(sat::solver const& src,
}
}
void verify_solution(char const * file_name) {
params_ref p = gparams::get_module("sat");
p.set_bool("produce_models", true);
reslimit limit;
sat::solver solver(p, limit);
std::ifstream in(file_name);
if (in.bad() || in.fail()) {
std::cerr << "(error \"failed to open file '" << file_name << "'\")" << std::endl;
exit(ERR_OPEN_FILE);
}
parse_dimacs(in, solver);
sat::model const & m = g_solver->get_model();
for (unsigned i = 1; i < m.size(); i++) {
sat::literal lit(i, false);
switch (m[i]) {
case l_false: lit.neg(); break;
case l_undef: break;
case l_true: break;
}
solver.mk_clause(1, &lit);
}
lbool r = solver.check();
switch (r) {
case l_false:
std::cout << "model checking failed\n";
break;
case l_true:
std::cout << "model validated\n";
break;
default:
std::cout << "inconclusive model\n";
break;
}
}
unsigned read_dimacs(char const * file_name) {
g_start_time = clock();
register_on_timeout_proc(on_timeout);
@ -164,6 +200,7 @@ unsigned read_dimacs(char const * file_name) {
switch (r) {
case l_true:
std::cout << "sat\n";
if (file_name) verify_solution(file_name);
display_model(*g_solver);
break;
case l_undef: