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

* src/tgbaalgos/dottydec.cc, src/tgbaalgos/dottydec.hh,

Browse source 
src/tgbaalgos/rundotdec.cc, src/tgbaalgos/rundotdec.hh: New files.
* src/tgbaalgos/Makefile.am (tgbaalgos_HEADERS,
libtgbaalgos_la_SOURCES): Add them.
* src/tgbaalgos/dotty.hh (dotty_reachable): Take a dotty_decorator
as third parameter.
* src/tgbaalgos/dotty.cc (dotty_bfs::process_state,
dotty_bfs::process_link): Use the decorator.
* src/tgbatest/ltl2tgba.cc: Graph the accepting run if the -g option
is given.
* src/tgbatest/emptchk.test: Exercize -g.
This commit is contained in:
Alexandre Duret-Lutz 2004-11-03 15:17:06 +00:00
parent a90b0648f8
commit 7688431451
10 changed files with 434 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/tgbaalgos/dotty.cc
View file

@ -33,8 +33,8 @@ namespace spot
class dotty_bfs : public tgba_reachable_iterator_breadth_first
{
public:
dotty_bfs(const tgba* a, std::ostream& os)
: tgba_reachable_iterator_breadth_first(a), os_(os)
dotty_bfs(std::ostream& os, const tgba* a, dotty_decorator* dd)
: tgba_reachable_iterator_breadth_first(a), os_(os), dd_(dd)
{
}
@ -53,34 +53,41 @@ namespace spot
}
void
process_state(const state* s, int n, tgba_succ_iterator*)
process_state(const state* s, int n, tgba_succ_iterator* si)
{
os_ << " " << n << " [label=\"";
escape_str(os_, automata_->format_state(s)) << "\"]" << std::endl;
os_ << " " << n << " "
<< dd_->state_decl(automata_, s, n, si,
escape_str(automata_->format_state(s)))
<< std::endl;
}
void
process_link(const state*, int in,
const state*, int out, const tgba_succ_iterator* si)
process_link(const state* in_s, int in,
const state* out_s, int out, const tgba_succ_iterator* si)
{
os_ << " " << in << " -> " << out << " [label=\"";
escape_str(os_, bdd_format_formula(automata_->get_dict(),
si->current_condition())) << "\\n";
escape_str(os_,
bdd_format_accset(automata_->get_dict(),
si->current_acceptance_conditions()))
<< "\"]" << std::endl;
std::string label =
bdd_format_formula(automata_->get_dict(),
si->current_condition())
+ "\n"
+ bdd_format_accset(automata_->get_dict(),
si->current_acceptance_conditions());
os_ << " " << in << " -> " << out << " "
<< dd_->link_decl(automata_, in_s, in, out_s, out, si,
escape_str(label))
<< std::endl;
}
private:
std::ostream& os_;
dotty_decorator* dd_;
};
}
std::ostream&
dotty_reachable(std::ostream& os, const tgba* g)
dotty_reachable(std::ostream& os, const tgba* g, dotty_decorator* dd)
{
dotty_bfs d(g, os);
dotty_bfs d(os, g, dd);
d.run();
return os;
}