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

fix constness of twa::get_init_state() and twa_succ_iterator::dst()

Browse source 
Fixes #125.

* src/kripke/kripkegraph.hh, src/ta/ta.cc, src/ta/ta.hh,
src/ta/taexplicit.cc, src/ta/taexplicit.hh, src/ta/taproduct.cc,
src/ta/taproduct.hh, src/ta/tgtaproduct.cc, src/ta/tgtaproduct.hh,
src/taalgos/dot.cc, src/taalgos/emptinessta.cc,
src/taalgos/emptinessta.hh, src/taalgos/minimize.cc,
src/taalgos/reachiter.cc, src/taalgos/tgba2ta.cc, src/twa/twa.hh,
src/twa/twagraph.hh, src/twa/twaproduct.cc, src/twa/twaproduct.hh,
src/twaalgos/compsusp.cc, src/twaalgos/gtec/gtec.cc,
src/twaalgos/ltl2tgba_fm.cc, src/twaalgos/reachiter.cc,
src/twaalgos/stutter.cc: Adjust.
This commit is contained in:
Alexandre Duret-Lutz 2015-11-28 21:47:04 +01:00
parent afbaa54d92
commit 06b176991e
24 changed files with 144 additions and 178 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/taalgos/emptinessta.cc
View file

@ -88,11 +88,11 @@ namespace spot
// Setup depth-first search from initial states.
auto& ta_ = a_->get_ta();
auto& kripke_ = a_->get_kripke();
state* kripke_init_state = kripke_->get_init_state();
auto kripke_init_state = kripke_->get_init_state();
bdd kripke_init_state_condition = kripke_->state_condition(
kripke_init_state);
spot::state* artificial_initial_state = ta_->get_artificial_initial_state();
auto artificial_initial_state = ta_->get_artificial_initial_state();
ta_succ_iterator* ta_init_it_ = ta_->succ_iter(artificial_initial_state,
kripke_init_state_condition);
@ -124,8 +124,7 @@ namespace spot
while (!todo.empty())
{
state* curr = todo.top().first;
auto curr = todo.top().first;
// We are looking at the next successor in SUCC.
ta_succ_iterator_product* succ = todo.top().second;
@ -249,7 +248,7 @@ namespace spot
// top of ROOT that have an index greater to the one of
// the SSCC of S2 (called the "threshold").
int threshold = std::abs(p.first->second);
std::list<state*> rem;
std::list<const state*> rem;
bool acc = false;
trace << "***PASS 1: CYCLE***\n";
@ -393,21 +392,17 @@ namespace spot
std::stack<pair_state_iter> todo;
// * init: the set of the depth-first search initial states
std::queue<spot::state*> ta_init_it_;
std::queue<const spot::state*> ta_init_it_;
const ta::states_set_t init_states_set = a_->get_initial_states_set();
ta::states_set_t::const_iterator it;
for (it = init_states_set.begin(); it != init_states_set.end(); ++it)
{
state* init_state = (*it);
ta_init_it_.push(init_state);
}
auto init_states_set = a_->get_initial_states_set();
for (auto init_state: init_states_set)
ta_init_it_.push(init_state);
while (!ta_init_it_.empty())
{
// Setup depth-first search from initial states.
{
state* init = ta_init_it_.front();
auto init = ta_init_it_.front();
ta_init_it_.pop();
if (!h.emplace(init, num + 1).second)
@ -426,8 +421,7 @@ namespace spot
while (!todo.empty())
{
state* curr = todo.top().first;
auto curr = todo.top().first;
// We are looking at the next successor in SUCC.
ta_succ_iterator_product* succ = todo.top().second;
@ -517,16 +511,12 @@ namespace spot
//self loop state
if (!curr->compare(i->first))
{
state* self_loop_state = curr;
if (t->is_livelock_accepting_state(self_loop_state))
{
clear(h, todo, ta_init_it_);
trace << "PASS 2: SUCCESS\n";
return true;
}
}
if (t->is_livelock_accepting_state(curr))
{
clear(h, todo, ta_init_it_);
trace << "PASS 2: SUCCESS\n";
return true;
}
// Now this is the most interesting case. We have reached a
// state S1 which is already part of a non-dead SSCC. Any such
@ -540,7 +530,7 @@ namespace spot
// top of ROOT that have an index greater to the one of
// the SSCC of S2 (called the "threshold").
int threshold = i->second;
std::list<state*> rem;
std::list<const state*> rem;
bool acc = false;
while (threshold < sscc.top().index)
@ -578,7 +568,7 @@ namespace spot
void
ta_check::clear(hash_type& h, std::stack<pair_state_iter> todo,
std::queue<spot::state*> init_states)
std::queue<const spot::state*> init_states)
{
set_states(states() + h.size());