alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

spot: Abstract cnf writing in SAT-based minimisation

Browse source 
* spot/misc/satsolver.hh: Declare all functions needed.
* spot/misc/satsolver.cc: Implement them.
* spot/twaalgos/dtbasat.cc: Abstract writing.
* spot/twaalgos/dtwasat.cc: Abstract writing.
This commit is contained in:
Alexandre GBAGUIDI AISSE 2017-01-06 09:50:25 +01:00
parent f2e091b9cd
commit 596bdec910
4 changed files with 213 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

52
spot/misc/satsolver.cc
View file

@ -128,22 +128,64 @@ namespace spot
start(); start();
} }
satsolver::~satsolver()
{
delete cnf_tmp_;
delete cnf_stream_;
delete nclauses_;
}
void satsolver::start() void satsolver::start()
{ {
cnf_tmp_ = create_tmpfile("sat-", ".cnf"); cnf_tmp_ = create_tmpfile("sat-", ".cnf");
cnf_stream_ = new std::ofstream(cnf_tmp_->name(), std::ios_base::trunc); cnf_stream_ = new std::ofstream(cnf_tmp_->name(), std::ios_base::trunc);
cnf_stream_->exceptions(std::ofstream::failbit | std::ofstream::badbit); cnf_stream_->exceptions(std::ofstream::failbit | std::ofstream::badbit);
nclauses_ = new clause_counter();
// Add empty line for the header
*cnf_stream_ << " \n";
} }
satsolver::~satsolver() void satsolver::end_clause()
{ {
delete cnf_tmp_; *cnf_stream_ << '\n';
delete cnf_stream_; *nclauses_ += 1;
} }
std::ostream& satsolver::operator()() void satsolver::add(std::initializer_list<int> values)
{ {
return *cnf_stream_; for (auto& v : values)
{
*cnf_stream_ << v << ' ';
if (!v) // ..., 0)
end_clause();
}
}
void satsolver::add(int v)
{
*cnf_stream_ << v << ' ';
if (!v) // 0
end_clause();
}
int satsolver::get_nb_clauses() const
{
return nclauses_->nb_clauses();
}
std::pair<int, int> satsolver::stats(int nvars)
{
int nclaus = nclauses_->nb_clauses();
cnf_stream_->seekp(0);
*cnf_stream_ << "p cnf " << nvars << ' ' << nclaus;
return std::make_pair(nvars, nclaus);
}
std::pair<int, int> satsolver::stats()
{
*cnf_stream_ << "p cnf 1 2\n-1 0\n1 0\n";
return std::make_pair(1, 2);
} }
satsolver::solution_pair satsolver::solution_pair

69
spot/misc/satsolver.hh
View file

@ -24,6 +24,7 @@
#include <vector> #include <vector>
#include <stdexcept> #include <stdexcept>
#include <iosfwd> #include <iosfwd>
#include <initializer_list>
namespace spot namespace spot
{ {
@ -68,14 +69,16 @@ namespace spot
/// \brief Interface with a SAT solver. /// \brief Interface with a SAT solver.
/// ///
/// Call start() to create some temporary file, then send DIMACs /// Call start() to initialize the cnf file. This class provides the
/// text to the stream returned by operator(), and finally call /// necessary functions to handle the cnf file, add clauses, count them,
/// get_solution(). /// update the header, add some comments...
/// It is not possible to write in the file without having to call these
/// functions.
/// ///
/// The satsolver called can be configured via the /// The satsolver called can be configured via the
/// <code>SPOT_SATSOLVER</code> environment variable. It /// <code>SPOT_SATSOLVER</code> environment variable. It must be this set
/// defaults to /// following this: "satsolver -verb=0 %I >%O".
/// "satsolver -verb=0 %I >%O" ///
/// where %I and %O are replaced by input and output files. /// where %I and %O are replaced by input and output files.
class SPOT_API satsolver class SPOT_API satsolver
{ {
@ -83,15 +86,67 @@ namespace spot
satsolver(); satsolver();
~satsolver(); ~satsolver();
/// \brief Initialize private attributes
void start(); void start();
std::ostream& operator()();
/// \brief Add a list of lit. to the current clause.
void add(std::initializer_list<int> values);
/// \brief Add a single lit. to the current clause.
void add(int v);
/// \breif Get the current number of clauses.
int get_nb_clauses() const;
/// \breif Update cnf_file's header with the correct stats.
std::pair<int, int> stats(int nvars);
/// \breif Create an unsatisfiable cnf_file, return stats about it.
std::pair<int, int> stats();
/// \breif Add a comment in cnf file.
template<typename T>
void comment_rec(T single)
{
*cnf_stream_ << single << ' ';
}
/// \breif Add a comment in cnf_file.
template<typename T, typename... Args>
void comment_rec(T first, Args... args)
{
*cnf_stream_ << first << ' ';
comment_rec(args...);
}
/// \breif Add a comment in the cnf_file, starting with 'c'.
template<typename T>
void comment(T single)
{
*cnf_stream_ << "c " << single << ' ';
}
/// \breif Add comment in the cnf_file, starting with 'c'.
template<typename T, typename... Args>
void comment(T first, Args... args)
{
*cnf_stream_ << "c " << first << ' ';
comment_rec(args...);
}
typedef std::vector<int> solution; typedef std::vector<int> solution;
typedef std::pair<int, solution> solution_pair; typedef std::pair<int, solution> solution_pair;
solution_pair get_solution(); solution_pair get_solution();
private:
/// \breif End the current clause and increment the counter.
void end_clause();
private: private:
temporary_file* cnf_tmp_; temporary_file* cnf_tmp_;
std::ostream* cnf_stream_; std::ostream* cnf_stream_;
clause_counter* nclauses_;
}; };
/// \brief Extract the solution of a SAT solver output. /// \brief Extract the solution of a SAT solver output.

108
spot/twaalgos/dtbasat.cc
View file

@ -43,8 +43,10 @@
#define DEBUG 0 #define DEBUG 0
#if DEBUG #if DEBUG
#define dout out << "c " #define dout out << "c "
#define cnf_comment(...) solver.comment(__VA_ARGS__)
#define trace std::cerr #define trace std::cerr
#else #else
#define cnf_comment(...) while (0) solver.comment(__VA_ARGS__)
#define dout while (0) std::cout #define dout while (0) std::cout
#define trace dout #define trace dout
#endif #endif
@ -294,12 +296,10 @@ namespace spot
typedef std::pair<int, int> sat_stats; typedef std::pair<int, int> sat_stats;
static static
sat_stats dtba_to_sat(std::ostream& out, sat_stats dtba_to_sat(satsolver solver,
const const_twa_graph_ptr& ref, const const_twa_graph_ptr& ref,
dict& d, bool state_based) dict& d, bool state_based)
{ {
clause_counter nclauses;
// Compute the AP used in the hard way. // Compute the AP used in the hard way.
bdd ap = bddtrue; bdd ap = bddtrue;
for (auto& t: ref->edges()) for (auto& t: ref->edges())
@ -324,21 +324,15 @@ namespace spot
// empty automaton is impossible // empty automaton is impossible
if (d.cand_size == 0) if (d.cand_size == 0)
{ return solver.stats();
out << "p cnf 1 2\n-1 0\n1 0\n";
return std::make_pair(1, 2);
}
// An empty line for the header
out << " \n";
#if DEBUG #if DEBUG
debug_dict = ref->get_dict(); debug_dict = ref->get_dict();
dout << "ref_size: " << ref_size << '\n'; solver.comment("ref_size", ref_size, '\n');
dout << "cand_size: " << d.cand_size << '\n'; solver.comment("cand_size", d.cand_size, '\n');
#endif #endif
dout << "symmetry-breaking clauses\n"; cnf_comment("symmetry-breaking clauses\n");
unsigned j = 0; unsigned j = 0;
bdd all = bddtrue; bdd all = bddtrue;
while (all != bddfalse) while (all != bddfalse)
@ -350,16 +344,15 @@ namespace spot
{ {
transition t(i, s, k); transition t(i, s, k);
int ti = d.transid[t]; int ti = d.transid[t];
dout << "¬" << t << '\n'; cnf_comment("¬", t, '\n');
out << -ti << " 0\n"; solver.add({-ti, 0});
++nclauses;
} }
++j; ++j;
} }
if (!nclauses.nb_clauses()) if (!solver.get_nb_clauses())
dout << "(none)\n"; cnf_comment("(none)\n");
dout << "(1) the candidate automaton is complete\n"; cnf_comment("(1) the candidate automaton is complete\n");
for (unsigned q1 = 0; q1 < d.cand_size; ++q1) for (unsigned q1 = 0; q1 < d.cand_size; ++q1)
{ {
bdd all = bddtrue; bdd all = bddtrue;
@ -369,36 +362,32 @@ namespace spot
all -= s; all -= s;
#if DEBUG #if DEBUG
dout; solver.comment("");
for (unsigned q2 = 0; q2 < d.cand_size; q2++) for (unsigned q2 = 0; q2 < d.cand_size; q2++)
{ {
transition t(q1, s, q2); transition t(q1, s, q2);
out << t << "δ"; solver.comment_rec(t, "δ");
if (q2 != d.cand_size) if (q2 != d.cand_size)
out << " ∨ "; solver.comment_rec(" ∨ ");
} }
out << '\n'; solver.comment_rec('\n');
#endif #endif
for (unsigned q2 = 0; q2 < d.cand_size; q2++) for (unsigned q2 = 0; q2 < d.cand_size; q2++)
{ {
transition t(q1, s, q2); transition t(q1, s, q2);
int ti = d.transid[t]; int ti = d.transid[t];
solver.add(ti);
out << ti << ' ';
} }
out << "0\n"; solver.add(0);
++nclauses;
} }
} }
dout << "(2) the initial state is reachable\n"; cnf_comment("(2) the initial state is reachable\n");
{ {
unsigned init = ref->get_init_state_number(); unsigned init = ref->get_init_state_number();
dout << state_pair(0, init) << '\n'; cnf_comment(state_pair(0, init), '\n');
out << d.prodid[state_pair(0, init)] << " 0\n"; solver.add({d.prodid[state_pair(0, init)], 0});
++nclauses;
} }
for (std::map<state_pair, int>::const_iterator pit = d.prodid.begin(); for (std::map<state_pair, int>::const_iterator pit = d.prodid.begin();
@ -407,8 +396,8 @@ namespace spot
unsigned q1 = pit->first.a; unsigned q1 = pit->first.a;
unsigned q1p = pit->first.b; unsigned q1p = pit->first.b;
dout << "(3) augmenting paths based on Cand[" << q1 cnf_comment("(3) augmenting paths based on Cand[", q1, "] and Ref[",
<< "] and Ref[" << q1p << "]\n"; q1p, "]\n");
for (auto& tr: ref->out(q1p)) for (auto& tr: ref->out(q1p))
{ {
unsigned dp = tr.dst; unsigned dp = tr.dst;
@ -429,10 +418,8 @@ namespace spot
if (pit->second == succ) if (pit->second == succ)
continue; continue;
dout << pit->first << " ∧ " << t << "δ → " << p2 << '\n'; cnf_comment(pit->first, " ∧ ", t, "δ → ", p2, '\n');
out << -pit->second << ' ' << -ti << ' ' solver.add({-pit->second, -ti, succ, 0});
<< succ << " 0\n";
++nclauses;
} }
} }
} }
@ -463,8 +450,8 @@ namespace spot
{ {
path p1(q1, q1p, q2, q2p); path p1(q1, q1p, q2, q2p);
dout << "(4&5) matching paths from reference based on " cnf_comment("(4&5) matching paths from reference based on",
<< p1 << '\n'; p1, '\n');
int pid1; int pid1;
if (q1 == q2 && q1p == q2p) if (q1 == q2 && q1p == q2p)
@ -495,11 +482,9 @@ namespace spot
int ti = d.transid[t]; int ti = d.transid[t];
int ta = d.transacc[t]; int ta = d.transacc[t];
dout << p1 << "R ∧ " << t << "δ → ¬" << t cnf_comment(p1, "R ∧", t, "δ → ¬", t,
<< "F\n"; "F\n");
out << -pid1 << ' ' << -ti << ' ' solver.add({-pid1, -ti, -ta, 0});
<< -ta << " 0\n";
++nclauses;
} }
@ -521,11 +506,8 @@ namespace spot
transition t(q2, s, q3); transition t(q2, s, q3);
int ti = d.transid[t]; int ti = d.transid[t];
dout << p1 << "R ∧ " << t << "δ → " << p2 cnf_comment(p1, "R ∧", t, "δ →", p2, "R\n");
<< "R\n"; solver.add({-pid1, -ti, pid2, 0});
out << -pid1 << ' ' << -ti << ' '
<< pid2 << " 0\n";
++nclauses;
} }
} }
} }
@ -555,8 +537,8 @@ namespace spot
for (unsigned q2 = 0; q2 < d.cand_size; ++q2) for (unsigned q2 = 0; q2 < d.cand_size; ++q2)
{ {
path p1(q1, q1p, q2, q2p); path p1(q1, q1p, q2, q2p);
dout << "(6&7) matching paths from candidate based on " cnf_comment("(6&7) matching paths from candidate based on",
<< p1 << '\n'; p1, '\n');
int pid1; int pid1;
if (q1 == q2 && q1p == q2p) if (q1 == q2 && q1p == q2p)
@ -588,11 +570,8 @@ namespace spot
int ti = d.transid[t]; int ti = d.transid[t];
int ta = d.transacc[t]; int ta = d.transacc[t];
dout << p1 << "C ∧ " << t << "δ → " << t cnf_comment(p1, "C ∧", t, "δ →", t, "F\n");
<< "F\n"; solver.add({-pid1, -ti, ta, 0});
out << -pid1 << ' ' << -ti << ' ' << ta
<< " 0\n";
++nclauses;
} }
} }
else // (7) no loop else // (7) no loop
@ -613,12 +592,9 @@ namespace spot
int ti = d.transid[t]; int ti = d.transid[t];
int ta = d.transacc[t]; int ta = d.transacc[t];
dout << p1 << "C ∧ " << t << "δ ∧ ¬" cnf_comment(p1, "C ∧", t, "δ ∧ ¬", t,
<< t << "F → " << p2 << "C\n"; "F →", p2, "C\n");
solver.add({-pid1, -ti, ta, pid2, 0});
out << -pid1 << ' ' << -ti << ' '
<< ta << ' ' << pid2 << " 0\n";
++nclauses;
} }
} }
} }
@ -626,9 +602,7 @@ namespace spot
} }
} }
} }
out.seekp(0); return solver.stats(d.nvars);
out << "p cnf " << d.nvars << ' ' << nclauses.nb_clauses();
return std::make_pair(d.nvars, nclauses.nb_clauses());
} }
static twa_graph_ptr static twa_graph_ptr
@ -757,7 +731,7 @@ namespace spot
timer_map t; timer_map t;
t.start("encode"); t.start("encode");
sat_stats s = dtba_to_sat(solver(), a, d, state_based); sat_stats s = dtba_to_sat(solver, a, d, state_based);
t.stop("encode"); t.stop("encode");
t.start("solve"); t.start("solve");
solution = solver.get_solution(); solution = solver.get_solution();

140
spot/twaalgos/dtwasat.cc
View file

@ -51,8 +51,10 @@
#define DEBUG 0 #define DEBUG 0
#if DEBUG #if DEBUG
#define dout out << "c " #define dout out << "c "
#define cnf_comment(...) solver.comment(__VA_ARGS__)
#define trace std::cerr #define trace std::cerr
#else #else
#define cnf_comment(...) while (0) solver.comment(__VA_ARGS__)
#define dout while (0) std::cout #define dout while (0) std::cout
#define trace dout #define trace dout
#endif #endif
@ -596,13 +598,12 @@ namespace spot
typedef std::pair<int, int> sat_stats; typedef std::pair<int, int> sat_stats;
static static
sat_stats dtwa_to_sat(std::ostream& out, const_twa_graph_ptr ref, sat_stats dtwa_to_sat(satsolver solver, const_twa_graph_ptr ref,
dict& d, bool state_based, bool colored) dict& d, bool state_based, bool colored)
{ {
#if DEBUG #if DEBUG
debug_dict = ref->get_dict(); debug_dict = ref->get_dict();
#endif #endif
clause_counter nclauses;
// Compute the AP used in the hard way. // Compute the AP used in the hard way.
bdd ap = bddtrue; bdd ap = bddtrue;
@ -629,23 +630,17 @@ namespace spot
// empty automaton is impossible // empty automaton is impossible
if (d.cand_size == 0) if (d.cand_size == 0)
{ return solver.stats();
out << "p cnf 1 2\n-1 0\n1 0\n";
return std::make_pair(1, 2);
}
// An empty line for the header
out << " \n";
#if DEBUG #if DEBUG
debug_ref_acc = &ref->acc(); debug_ref_acc = &ref->acc();
debug_cand_acc = &d.cacc; debug_cand_acc = &d.cacc;
dout << "ref_size: " << ref_size << '\n'; solver.comment("ref_size:", ref_size, '\n');
dout << "cand_size: " << d.cand_size << '\n'; solver.comment("cand_size:", d.cand_size, '\n');
#endif #endif
auto& racc = ref->acc(); auto& racc = ref->acc();
dout << "symmetry-breaking clauses\n"; cnf_comment("symmetry-breaking clauses\n");
int j = 0; int j = 0;
bdd all = bddtrue; bdd all = bddtrue;
while (all != bddfalse) while (all != bddfalse)
@ -657,16 +652,15 @@ namespace spot
{ {
transition t(i, s, k); transition t(i, s, k);
int ti = d.transid[t]; int ti = d.transid[t];
dout << "¬" << t << '\n'; cnf_comment("¬", t, '\n');
out << -ti << " 0\n"; solver.add({-ti, 0});
++nclauses;
} }
++j; ++j;
} }
if (!nclauses.nb_clauses()) if (!solver.get_nb_clauses())
dout << "(none)\n"; cnf_comment("(none)\n");
dout << "(8) the candidate automaton is complete\n"; cnf_comment("(8) the candidate automaton is complete\n");
for (unsigned q1 = 0; q1 < d.cand_size; ++q1) for (unsigned q1 = 0; q1 < d.cand_size; ++q1)
{ {
bdd all = bddtrue; bdd all = bddtrue;
@ -676,15 +670,15 @@ namespace spot
all -= s; all -= s;
#if DEBUG #if DEBUG
dout; solver.comment("");
for (unsigned q2 = 0; q2 < d.cand_size; ++q2) for (unsigned q2 = 0; q2 < d.cand_size; ++q2)
{ {
transition t(q1, s, q2); transition t(q1, s, q2);
out << t << "δ"; solver.comment_rec(t, "δ");
if (q2 != d.cand_size) if (q2 != d.cand_size)
out << " ∨ "; solver.comment_rec(" ∨ ");
} }
out << '\n'; solver.comment_rec('\n');
#endif #endif
for (unsigned q2 = 0; q2 < d.cand_size; ++q2) for (unsigned q2 = 0; q2 < d.cand_size; ++q2)
@ -692,26 +686,24 @@ namespace spot
transition t(q1, s, q2); transition t(q1, s, q2);
int ti = d.transid[t]; int ti = d.transid[t];
out << ti << ' '; solver.add(ti);
} }
out << "0\n"; solver.add(0);
++nclauses;
} }
} }
dout << "(9) the initial state is reachable\n"; cnf_comment("(9) the initial state is reachable\n");
{ {
unsigned init = ref->get_init_state_number(); unsigned init = ref->get_init_state_number();
dout << path(0, init) << '\n'; cnf_comment(path(0, init), '\n');
out << d.pathid[path(0, init)] << " 0\n"; solver.add({d.pathid[path(0, init)], 0});
++nclauses;
} }
if (colored) if (colored)
{ {
unsigned nacc = d.cand_nacc; unsigned nacc = d.cand_nacc;
dout << "transitions belong to exactly one of the " cnf_comment("transitions belong to exactly one of the", nacc,
<< nacc << " acceptance set\n"; "acceptance set\n");
bdd all = bddtrue; bdd all = bddtrue;
while (all != bddfalse) while (all != bddfalse)
{ {
@ -730,25 +722,23 @@ namespace spot
{ {
transition_acc tj(q1, l, {j}, q2); transition_acc tj(q1, l, {j}, q2);
int taj = d.transaccid[tj]; int taj = d.transaccid[tj];
out << -tai << ' ' << -taj << " 0\n"; solver.add({-tai, -taj, 0});
++nclauses;
} }
} }
for (unsigned i = 0; i < nacc; ++i) for (unsigned i = 0; i < nacc; ++i)
{ {
transition_acc ti(q1, l, {i}, q2); transition_acc ti(q1, l, {i}, q2);
int tai = d.transaccid[ti]; int tai = d.transaccid[ti];
out << tai << ' '; solver.add(tai);
} }
out << "0\n"; solver.add(0);
++nclauses;
} }
} }
} }
if (!d.all_silly_cand_acc.empty()) if (!d.all_silly_cand_acc.empty())
{ {
dout << "no transition with silly acceptance\n"; cnf_comment("no transition with silly acceptance\n");
bdd all = bddtrue; bdd all = bddtrue;
while (all != bddfalse) while (all != bddfalse)
{ {
@ -758,25 +748,24 @@ namespace spot
for (unsigned q2 = 0; q2 < d.cand_size; ++q2) for (unsigned q2 = 0; q2 < d.cand_size; ++q2)
for (auto& s: d.all_silly_cand_acc) for (auto& s: d.all_silly_cand_acc)
{ {
dout << "no (" << q1 << ',' cnf_comment("no (", q1, ',',
<< bdd_format_formula(debug_dict, l) bdd_format_formula(debug_dict, l), ',', s,
<< ',' << s << ',' << q2 << ")\n"; ',', q2, ")\n");
for (unsigned v: s.sets()) for (unsigned v: s.sets())
{ {
transition_acc ta(q1, l, d.cacc.mark(v), q2); transition_acc ta(q1, l, d.cacc.mark(v), q2);
int tai = d.transaccid[ta]; int tai = d.transaccid[ta];
assert(tai != 0); assert(tai != 0);
out << ' ' << -tai; solver.add(-tai);
} }
for (unsigned v: d.cacc.comp(s).sets()) for (unsigned v: d.cacc.comp(s).sets())
{ {
transition_acc ta(q1, l, d.cacc.mark(v), q2); transition_acc ta(q1, l, d.cacc.mark(v), q2);
int tai = d.transaccid[ta]; int tai = d.transaccid[ta];
assert(tai != 0); assert(tai != 0);
out << ' ' << tai; solver.add(tai);
} }
out << " 0\n"; solver.add(0);
++nclauses;
} }
} }
} }
@ -786,8 +775,8 @@ namespace spot
{ {
if (!sm.reachable_state(q1p)) if (!sm.reachable_state(q1p))
continue; continue;
dout << "(10) augmenting paths based on Cand[" << q1 cnf_comment("(10) augmenting paths based on Cand[", q1,
<< "] and Ref[" << q1p << "]\n"; "] and Ref[", q1p, "]\n");
path p1(q1, q1p); path p1(q1, q1p);
int p1id = d.pathid[p1]; int p1id = d.pathid[p1];
@ -811,9 +800,8 @@ namespace spot
if (p1id == succ) if (p1id == succ)
continue; continue;
dout << p1 << " ∧ " << t << "δ → " << p2 << '\n'; cnf_comment(p1, "∧", t, "δ →", p2, '\n');
out << -p1id << ' ' << -ti << ' ' << succ << " 0\n"; solver.add({-p1id, -ti, succ, 0});
++nclauses;
} }
} }
} }
@ -854,7 +842,8 @@ namespace spot
path p(q1, q1p, q2, q2p, path p(q1, q1p, q2, q2p,
d.all_cand_acc[f], refhist); d.all_cand_acc[f], refhist);
dout << "(11&12&13) paths from " << p << '\n'; cnf_comment("(11&12&13) paths from ", p,
'\n');
int pid = d.pathid[p]; int pid = d.pathid[p];
@ -892,10 +881,9 @@ namespace spot
for (auto& v: missing) for (auto& v: missing)
{ {
#if DEBUG #if DEBUG
dout << (rejloop ? solver.comment((rejloop ?
"(11) " : "(12) ") "(11) " : "(12) "), p,
<< p << " ∧ " " ∧ ", t, "δ → (");
<< t << "δ → (";
const char* orsep = ""; const char* orsep = "";
for (int s: v) for (int s: v)
{ {
@ -905,21 +893,23 @@ namespace spot
ta(q2, l, ta(q2, l,
d.cacc.mark(-s - 1), d.cacc.mark(-s - 1),
q1); q1);
out << orsep << "¬" << ta; solver.comment_rec(orsep,
"¬", ta);
} }
else else
{ {
transition_acc transition_acc
ta(q2, l, ta(q2, l,
d.cacc.mark(s), q1); d.cacc.mark(s), q1);
out << orsep << ta; solver.comment_rec(orsep,
ta);
} }
out << "FC"; solver.comment_rec("FC");
orsep = " ∨ "; orsep = " ∨ ";
} }
out << ")\n"; solver.comment_rec(")\n");
#endif // DEBUG #endif // DEBUG
out << -pid << ' ' << -ti; solver.add({-pid, -ti});
for (int s: v) for (int s: v)
if (s < 0) if (s < 0)
{ {
@ -929,7 +919,7 @@ namespace spot
q1); q1);
int tai = d.transaccid[ta]; int tai = d.transaccid[ta];
assert(tai != 0); assert(tai != 0);
out << ' ' << -tai; solver.add(-tai);
} }
else else
{ {
@ -938,10 +928,9 @@ namespace spot
d.cacc.mark(s), q1); d.cacc.mark(s), q1);
int tai = d.transaccid[ta]; int tai = d.transaccid[ta];
assert(tai != 0); assert(tai != 0);
out << ' ' << tai; solver.add(tai);
} }
out << " 0\n"; solver.add(0);
++nclauses;
} }
} }
// (13) augmenting paths (always). // (13) augmenting paths (always).
@ -964,8 +953,8 @@ namespace spot
if (pid == p2id) if (pid == p2id)
continue; continue;
#if DEBUG #if DEBUG
dout << "(13) " << p << " ∧ " solver.comment("(13) ", p, " ∧ ",
<< t << "δ "; t, "δ ");
auto biga_ = d.all_cand_acc[f]; auto biga_ = d.all_cand_acc[f];
for (unsigned m = 0; for (unsigned m = 0;
@ -977,12 +966,13 @@ namespace spot
const char* not_ = "¬"; const char* not_ = "¬";
if (biga_.has(m)) if (biga_.has(m))
not_ = ""; not_ = "";
out << " ∧ " << not_ solver.comment_rec(" ∧ ", not_,
<< ta << "FC"; ta, "FC");
} }
out << " → " << p2 << '\n'; solver.comment_rec(" → ", p2,
'\n');
#endif #endif
out << -pid << ' ' << -ti << ' '; solver.add({-pid, -ti});
auto biga = d.all_cand_acc[f]; auto biga = d.all_cand_acc[f];
for (unsigned m = 0; for (unsigned m = 0;
m < d.cand_nacc; ++m) m < d.cand_nacc; ++m)
@ -993,11 +983,9 @@ namespace spot
int tai = d.transaccid[ta]; int tai = d.transaccid[ta];
if (biga.has(m)) if (biga.has(m))
tai = -tai; tai = -tai;
out << tai << ' '; solver.add(tai);
} }
solver.add({p2id, 0});
out << p2id << " 0\n";
++nclauses;
} }
} }
} }
@ -1007,9 +995,7 @@ namespace spot
} }
} }
} }
out.seekp(0); return solver.stats(d.nvars);
out << "p cnf " << d.nvars << ' ' << nclauses.nb_clauses();
return std::make_pair(d.nvars, nclauses.nb_clauses());
} }
static twa_graph_ptr static twa_graph_ptr
@ -1136,7 +1122,7 @@ namespace spot
timer_map t; timer_map t;
t.start("encode"); t.start("encode");
sat_stats s = dtwa_to_sat(solver(), a, d, state_based, colored); sat_stats s = dtwa_to_sat(solver, a, d, state_based, colored);
t.stop("encode"); t.stop("encode");
t.start("solve"); t.start("solve");
solution = solver.get_solution(); solution = solver.get_solution();