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

* tgbaalgos/reachiter.hh, tgbaalgos/reachiter.cc

Browse source 
(tgba_reachable_iterator::process_link): Take the state* as arguments
in addition to the state numbers.
* src/tgba/tgbaexplicit.hh, src/tgba/tgbaexplicit.cc
(tgba_explicit::copy_acceptance_conditions_of): New method.
* tgbaalgos/dupexp.cc (dupexp_iter::dupexp_iter): Call
copy_acceptance_conditions_of.
(dupexp_iter::process_state, duplex_iter::declare_state,
dupexp_iter::name_): Remove.
(dupexp_iter::process_link): Adjust prototype, and format
the state here rather than in process_state.
* tgbaalgos/stats.cc, tgbaalgos/dotty.cc: Adjust prototype
of process_link.
This commit is contained in:
Alexandre Duret-Lutz 2004-11-03 11:59:58 +00:00
parent b6f3faba38
commit 42b05c7a05
8 changed files with 62 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/tgbaalgos/dupexp.cc
View file

@ -36,6 +36,7 @@ namespace spot
dupexp_iter(const tgba* a)
: T(a), out_(new tgba_explicit(a->get_dict()))
{
out_->copy_acceptance_conditions_of(a);
}
tgba_explicit*
@ -45,54 +46,23 @@ namespace spot
}
void
process_state(const state* s, int n, tgba_succ_iterator*)
process_link(const state* in_s, int in,
const state* out_s, int out,
const tgba_succ_iterator* si)
{
std::ostringstream os;
os << "(#" << n << ") " << this->automata_->format_state(s);
name_[n] = os.str();
}
std::string
declare_state(const state* s, int n)
{
std::string str;
name_map_::const_iterator i = name_.find(n);
if (i == name_.end())
{
std::ostringstream os;
os << "(#" << n << ") " << this->automata_->format_state(s);
name_[n] = str = os.str();
}
else
{
str = i->second;
}
delete s;
return str;
}
void
process_link(int in, int out, const tgba_succ_iterator* si)
{
// We might need to format out before process_state is called.
name_map_::const_iterator i = name_.find(out);
if (i == name_.end())
{
const state* s = si->current_state();
process_state(s, out, 0);
delete s;
}
std::ostringstream in_name;
in_name << "(#" << in << ") " << this->automata_->format_state(in_s);
std::ostringstream out_name;
out_name << "(#" << out << ") " << this->automata_->format_state(out_s);
tgba_explicit::transition* t =
out_->create_transition(name_[in], name_[out]);
out_->create_transition(in_name.str(), out_name.str());
out_->add_conditions(t, si->current_condition());
out_->add_acceptance_conditions(t, si->current_acceptance_conditions());
}
private:
tgba_explicit* out_;
typedef std::map<int, std::string> name_map_;
std::map<int, std::string> name_;
};
} // anonymous