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

Changes to pass sanity tests

Browse source 
* src/ta/taexplicit.hh, src/ta/taexplicit.cc, src/taalgos/minimize.cc,
src/taalgos/tgba2ta.cc, src/tgbatest/ltl2tgba.cc: correct the code style
in order to respect the sanity rules
This commit is contained in:
Ala-Eddine Ben-Salem 2012-04-11 11:15:19 +02:00 • committed by Alexandre Duret-Lutz
parent 5a706300b0
commit 618146c157
5 changed files with 21 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/ta/taexplicit.cc
View file

@ -311,12 +311,12 @@ namespace spot
&& (!dest_is_livelock_accepting))) && (!dest_is_livelock_accepting)))
{ {
get_transitions((*it_trans)->condition)->remove(*it_trans); get_transitions((*it_trans)->condition)->remove(*it_trans);
delete (*it_trans); delete *it_trans;
it_trans = trans->erase(it_trans); it_trans = trans->erase(it_trans);
} }
else else
{ {
it_trans++; ++it_trans;
} }
} }
@ -536,7 +536,7 @@ namespace spot
} }
else else
{ {
it_trans++; ++it_trans;
} }
} }
} }

2
src/ta/taexplicit.hh
View file

@ -127,7 +127,7 @@ namespace spot
bdd bdd
all_acceptance_conditions() const all_acceptance_conditions() const
{ {
return all_acceptance_conditions_;; return all_acceptance_conditions_;
} }
private: private:

20
src/taalgos/minimize.cc
View file

@ -264,7 +264,7 @@ namespace spot
used_var[set_num] = 1; used_var[set_num] = 1;
free_var.erase(set_num); free_var.erase(set_num);
state_set_map[*i] = set_num; state_set_map[*i] = set_num;
set_num++; ++set_num;
} }
@ -275,7 +275,7 @@ namespace spot
{ {
unsigned s = G->size(); unsigned s = G->size();
unsigned num = set_num; unsigned num = set_num;
set_num++; ++set_num;
used_var[num] = s; used_var[num] = s;
free_var.erase(num); free_var.erase(num);
if (s > 1) if (s > 1)
@ -293,7 +293,7 @@ namespace spot
{ {
unsigned s = F->size(); unsigned s = F->size();
unsigned num = set_num; unsigned num = set_num;
set_num++; ++set_num;
used_var[num] = s; used_var[num] = s;
free_var.erase(num); free_var.erase(num);
if (s > 1) if (s > 1)
@ -310,7 +310,7 @@ namespace spot
{ {
unsigned s = G_F->size(); unsigned s = G_F->size();
unsigned num = set_num; unsigned num = set_num;
set_num++; ++set_num;
used_var[num] = s; used_var[num] = s;
free_var.erase(num); free_var.erase(num);
if (s > 1) if (s > 1)
@ -327,7 +327,7 @@ namespace spot
{ {
unsigned s = S->size(); unsigned s = S->size();
unsigned num = set_num; unsigned num = set_num;
set_num++; ++set_num;
used_var[num] = s; used_var[num] = s;
free_var.erase(num); free_var.erase(num);
if (s > 1) if (s > 1)
@ -346,7 +346,7 @@ namespace spot
bool did_split = true; bool did_split = true;
unsigned num = set_num; unsigned num = set_num;
set_num++; ++set_num;
used_var[num] = 1; used_var[num] = 1;
free_var.erase(num); free_var.erase(num);
bdd bdd_false_acceptance_condition = bdd_ithvar(num); bdd bdd_false_acceptance_condition = bdd_ithvar(num);
@ -388,21 +388,21 @@ namespace spot
trace trace
<< "+f: " << bdd_format_accset(ta_->get_dict(), f) << "+f: " << bdd_format_accset(ta_->get_dict(), f)
<< std::endl; << std::endl;
;
trace trace
<< " -bdd_ithvar(i->second): " << bdd_format_accset( << " -bdd_ithvar(i->second): " << bdd_format_accset(
ta_->get_dict(), bdd_ithvar(i->second)) << std::endl; ta_->get_dict(), bdd_ithvar(i->second)) << std::endl;
;
trace trace
<< " -si->current_condition(): " << " -si->current_condition(): "
<< bdd_format_accset(ta_->get_dict(), << bdd_format_accset(ta_->get_dict(),
si->current_condition()) << std::endl; si->current_condition()) << std::endl;
;
trace trace
<< " -current_acceptance_conditions: " << " -current_acceptance_conditions: "
<< bdd_format_accset(ta_->get_dict(), << bdd_format_accset(ta_->get_dict(),
current_acceptance_conditions) << std::endl; current_acceptance_conditions) << std::endl;
;
} }
delete si; delete si;

2
src/taalgos/tgba2ta.cc
View file

@ -114,7 +114,7 @@ namespace spot
} }
it_trans++; ++it_trans;
} }

8
src/tgbatest/ltl2tgba.cc
View file

@ -1100,7 +1100,7 @@ main(int argc, char** argv)
//TA //TA
spot::ltl::atomic_prop_set* aps = atomic_prop_collect(f, 0); spot::ltl::atomic_prop_set* aps = atomic_prop_collect(f, 0);
bdd atomic_props_set_bdd = bdd_true(); bdd atomic_props_set_bdd = bdd_true;
for (spot::ltl::atomic_prop_set::const_iterator i = aps->begin(); i for (spot::ltl::atomic_prop_set::const_iterator i = aps->begin(); i
!= aps->end(); ++i) != aps->end(); ++i)
{ {
@ -1123,7 +1123,8 @@ main(int argc, char** argv)
opt_with_artificial_livelock); opt_with_artificial_livelock);
spot::ta* testing_automata_nm = 0; spot::ta* testing_automata_nm = 0;
if (opt_minimize) { if (opt_minimize)
{
testing_automata_nm = testing_automata; testing_automata_nm = testing_automata;
testing_automata = minimize_ta(testing_automata); testing_automata = minimize_ta(testing_automata);
} }
@ -1150,7 +1151,8 @@ main(int argc, char** argv)
delete testing_automata; delete testing_automata;
a = 0; a = 0;
degeneralized = 0; degeneralized = 0;
if (degeneralize_opt != DegenSBA) to_free = 0; if (degeneralize_opt != DegenSBA)
to_free = 0;
aut_red = 0; aut_red = 0;
output = -1; output = -1;