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

Adjust benchmarks that had not been compiled since 0.8...

Browse source 
* bench/scc-stats/stats.cc, bench/split-product/cutscc.cc: Adjust to
use state->destroy() and to use const formula*.
This commit is contained in:
Alexandre Duret-Lutz 2012-05-02 18:19:57 +02:00
parent db4693b303
commit 42963b99c8
2 changed files with 13 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

18
bench/scc-stats/stats.cc
View file

@ -1,5 +1,6 @@
// Copyright (C) 2009, 2010 Laboratoire de Recherche et Développement // -*- coding: utf-8 -*-
// de l'Epita (LRDE). // Copyright (C) 2009, 2010, 2012 Laboratoire de Recherche et
// Développement de l'Epita (LRDE).
// //
// This file is part of Spot, a model checking library. // This file is part of Spot, a model checking library.
// //
@ -57,16 +58,14 @@ namespace spot
} }
else else
// No, free dst. // No, free dst.
delete dst; dst->destroy();
} }
delete sit; delete sit;
} }
hash_type::iterator it2; hash_type::iterator it2;
// Free visited states. // Free visited states.
for (it2 = seen.begin(); it2 != seen.end(); it2++) for (it2 = seen.begin(); it2 != seen.end(); it2++)
{ (*it2)->destroy();
delete *it2;
}
return count; return count;
} }
} }
@ -114,7 +113,6 @@ int main (int argc, char* argv[])
output.open("results"); output.open("results");
spot::bdd_dict* dict = new spot::bdd_dict(); spot::bdd_dict* dict = new spot::bdd_dict();
unsigned count = 0; unsigned count = 0;
bool count_even;
std::vector<double> acc_scc; std::vector<double> acc_scc;
std::vector<double> dead_scc; std::vector<double> dead_scc;
std::vector<double> acc_paths; std::vector<double> acc_paths;
@ -124,8 +122,7 @@ int main (int argc, char* argv[])
unsigned k = 0; unsigned k = 0;
// Get each LTL formula. // Get each LTL formula.
spot::ltl::ltl_file formulae(argv[1]); spot::ltl::ltl_file formulae(argv[1]);
spot::ltl::formula* f; while (const spot::ltl::formula* f = formulae.next())
while((f = formulae.next()))
{ {
++k; ++k;
spot::tgba* a = ltl_to_tgba_fm(f, dict, /* exprop */ true); spot::tgba* a = ltl_to_tgba_fm(f, dict, /* exprop */ true);
@ -135,7 +132,7 @@ int main (int argc, char* argv[])
m.build_map(); m.build_map();
spot::state* initial_state = a->get_init_state(); spot::state* initial_state = a->get_init_state();
unsigned init = m.scc_of_state(initial_state); unsigned init = m.scc_of_state(initial_state);
delete initial_state; initial_state->destroy();
std::vector<std::vector<spot::sccs_set* > >* paths = find_paths(a, m); std::vector<std::vector<spot::sccs_set* > >* paths = find_paths(a, m);
unsigned spanning_count =spot::max_spanning_paths(&(*paths)[init], m); unsigned spanning_count =spot::max_spanning_paths(&(*paths)[init], m);
spanning_paths.push_back(double(spanning_count)); spanning_paths.push_back(double(spanning_count));
@ -175,7 +172,6 @@ int main (int argc, char* argv[])
sort(spanning_paths.begin(), spanning_paths.end()); sort(spanning_paths.begin(), spanning_paths.end());
sort(dead_paths.begin(), dead_paths.end()); sort(dead_paths.begin(), dead_paths.end());
sort(self_loops.begin(), self_loops.end()); sort(self_loops.begin(), self_loops.end());
count_even = (count % 2 == 0);
output << "Parsed Formulae : " << count << std::endl << std::endl; output << "Parsed Formulae : " << count << std::endl << std::endl;
// Accepting SCCs // Accepting SCCs

14
bench/split-product/cutscc.cc
View file

@ -1,5 +1,6 @@
// Copyright (C) 2009, 2010 Laboratoire de Recherche et Développement // -*- coding: utf-8 -*-
// de l'Epita (LRDE). // Copyright (C) 2009, 2010, 2012 Laboratoire de Recherche et
// Développement de l'Epita (LRDE).
// //
// This file is part of Spot, a model checking library. // This file is part of Spot, a model checking library.
// //
@ -67,16 +68,14 @@ namespace spot
} }
else else
// No, free dst. // No, free dst.
delete dst; dst->destroy();
} }
delete sit; delete sit;
} }
hash_type::iterator it2; hash_type::iterator it2;
// Free visited states. // Free visited states.
for (it2 = seen.begin(); it2 != seen.end(); it2++) for (it2 = seen.begin(); it2 != seen.end(); it2++)
{ (*it2)->destroy();
delete *it2;
}
return count; return count;
} }
} }
@ -165,8 +164,7 @@ int main(int argc, char* argv[])
<< " times to improve precision." << std::endl << std::endl; << " times to improve precision." << std::endl << std::endl;
spot::ltl::ltl_file formulae(argv[1]); spot::ltl::ltl_file formulae(argv[1]);
spot::ltl::formula* f; while (const spot::ltl::formula* f = formulae.next())
while((f = formulae.next()))
{ {
spot::tgba* a = ltl_to_tgba_fm(f, dict, /* exprop */ true); spot::tgba* a = ltl_to_tgba_fm(f, dict, /* exprop */ true);
++i; ++i;