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

* src/tgbatest/randtgba.cc: Remplace the -O option by -A, reading

Browse source 
all algorithms from a file.  Use the emptiness_check_instantiator
syntax as name in the output.
* bench/emptchk/defs.in: DEfine ALGORITHMS here.
* bench/emptchk/ltl-human.sh, bench/emptchk/ltl-random.sh,
bench/emptchk/pml-clserv.sh, bench/emptchk/pml-clserv.sh: Use
$ALGORITHMS.
* src/misc/timer.cc: Truncate long keys in display.
This commit is contained in:
Alexandre Duret-Lutz 2005-02-18 12:28:42 +00:00
parent 3b3a196526
commit 6314b682ba
9 changed files with 144 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,5 +1,14 @@
2005-02-18 Alexandre Duret-Lutz <adl@src.lip6.fr> 2005-02-18 Alexandre Duret-Lutz <adl@src.lip6.fr>
* src/tgbatest/randtgba.cc: Remplace the -O option by -A, reading
all algorithms from a file. Use the emptiness_check_instantiator
syntax as name in the output.
* bench/emptchk/defs.in: DEfine ALGORITHMS here.
* bench/emptchk/ltl-human.sh, bench/emptchk/ltl-random.sh,
bench/emptchk/pml-clserv.sh, bench/emptchk/pml-clserv.sh: Use
$ALGORITHMS.
* src/misc/timer.cc: Truncate long keys in display.
* src/tgbatest/ltl2tgba.cc: Simplify using * src/tgbatest/ltl2tgba.cc: Simplify using
emptiness_check_instantiator. emptiness_check_instantiator.
* src/tgba/tgba.cc, src/tgba/tgba.hh * src/tgba/tgba.cc, src/tgba/tgba.hh

64
bench/emptchk/README
View file

@ -175,51 +175,42 @@ This directory contains:
INTERPRETING THE RESULTS INTERPRETING THE RESULTS
========================== ==========================
Here are the short names for the algorithms used in the outputs. Here are the short names for the algorithms presented in the outputs.
ltl-*.sh tests use names from the left column, and pml-*.sh tests
use names from the right column.
Cou99 Cou99 Cou99
Cou99_shy- Cou99(shy !group) Cou99(shy !group)
Cou99_shy Cou99(shy group) Cou99(shy group)
> Cou99_rem Cou99(poprem) > Cou99(poprem) # called `Cou99' in the paper
> Cou99_rem_shy- Cou99(poprem shy !group) > Cou99(poprem shy !group) # called `Cou99 Shy-' in the paper
> Cou99_rem_shy Cou99(poprem shy group) > Cou99(poprem shy group) # called `Cou99 Shy' in the paper
> CVWY90 CVWY90 > CVWY90
CVWY90_bsh CVWY90(bsh=4K) > GV04
> GV04 GV04 > SE05
> SE05 SE05 > Tau03
SE05_bsh SE05(bsh=4K) > Tau03_opt
> Tau03 Tau03
> Tau03_opt Tau03_opt
Only the algorithms marked with a `>' have been shown in the paper. Only the algorithms marked with a `>' have been shown in the paper.
`bsh' stands for `bit-state hashing'.
`Cou99_rem*' algorithms are using the `rem' field to remove `Cou99(poprem*)' algorithms are using the `rem' field to remove the
the SCC without recomputing the SCC as described in the paper. SCC without recomputing the SCC as described in the paper. The
The other `Cou99*' algorithms are not. (Beware that in the paper other `Cou99' algorithms are not. (Beware that in the paper we
we presented the `Cou99_rem*' variants and called them `Cou99*'.) presented the `Cou99(poprem*)' variants and called them `Cou99*'.)
The ltl-*.sh tests output look as follows: The ltl-*.sh tests output look as follows:
| density: 0.001 | density: 0.001
| Emptiness check ratios | Emptiness check ratios
| CVWY90 5.5 4.4 6.3 25 | Cou99 18.9 9.6 10.4 29
| CVWY90_bsh 5.7 4.8 6.3 25 | Cou99(shy !group) 16.7 16.3 25.7 29
| Cou99 5.5 3.3 4.3 25
| Cou99_rem 5.5 3.0 4.3 25
| ... | ...
(A) (B) (C) (D) (A) (B) (C) (D)
| |
| Accepting run ratios | Accepting run ratios
| CVWY90 5.5 2.6 | Cou99 8.6 13.5
| Cou99 2.0 2.6 | Cou99(shy !group) 7.3 12.2
| Cou99_rem 2.0 2.1
| Cou99_rem_shy 1.2 2.1
| ... | ...
(E) (F) (E) (F)
(A) mean number of distinct states visited (A) mean number of distinct states visited
expressed as a % of the number of state of the product space expressed as a % of the number of state of the product space
@ -237,10 +228,10 @@ This directory contains:
The pml-*.sh tests output look as follows: The pml-*.sh tests output look as follows:
| Cou99 , 783, 2371, 5, 783, 4742, 237, no accepting run found | Cou99 , 92681, 391160, 1, 92681, 391160, 46471, no accepting run found
| Cou99_shy- , 783, 2371, 5, 783, 4742, 537, no accepting run found | Cou99(shy !group) , 92681, 391160, 1, 92681, 391160, 47148, no accepting run found
| ... | ...
(G) (H) (I) (K) (L) (M) (N) (G) (H) (I) (K) (L) (M) (N)
(G) Number of states in the product. (G) Number of states in the product.
(H) Number of transitions in the product. (H) Number of transitions in the product.
@ -260,5 +251,10 @@ This directory contains:
shown above. Try removing the `-1' option from the script, or toying shown above. Try removing the `-1' option from the script, or toying
with randtgba itself. with randtgba itself.
CVWY90 and SE05 have bit-state hashing implementations. Edit the
file `algorithms' and add lines like `CVWY90(bsh=5M)' or
`SE05(bsh=512K)' to try these.
(The `bsh=' argument gives the hash table size in bytes.)
Besides randtgba, two other tools that you might find handy we Besides randtgba, two other tools that you might find handy we
experimenting are src/ltltest/randltl and src/tgbatest/ltl2tgba. experimenting are src/ltltest/randltl and src/tgbatest/ltl2tgba.

1
bench/emptchk/defs.in
View file

@ -37,3 +37,4 @@ test -f "$srcdir/defs.in" || {
RANDTGBA='@top_builddir@/src/tgbatest/randtgba@EXEEXT@' RANDTGBA='@top_builddir@/src/tgbatest/randtgba@EXEEXT@'
LTL2TGBA='@top_builddir@/src/tgbatest/ltl2tgba@EXEEXT@' LTL2TGBA='@top_builddir@/src/tgbatest/ltl2tgba@EXEEXT@'
FORMULAE=$srcdir/formulae.ltl FORMULAE=$srcdir/formulae.ltl
ALGORITHMS=$srcdir/algorithms

4
bench/emptchk/ltl-human.sh
View file

@ -29,12 +29,12 @@ echo "WITHOUT ADDITIONAL ACCEPTING CONDITIONS"
for d in 0.001 0.002 0.01; do for d in 0.001 0.002 0.01; do
echo "density: $d" echo "density: $d"
$RANDTGBA -d $d $opts $RANDTGBA -A "$ALGORITHMS" -d $d $opts
done done
echo "WITH 3 ADDITIONAL ACCEPTING CONDITIONS" echo "WITH 3 ADDITIONAL ACCEPTING CONDITIONS"
for d in 0.001 0.002 0.01; do for d in 0.001 0.002 0.01; do
echo "density: $d" echo "density: $d"
$RANDTGBA -a 3 0.0133333 -d $d $opts $RANDTGBA -A "$ALGORITHMS" -a 3 0.0133333 -d $d $opts
done done

4
bench/emptchk/ltl-random.sh
View file

@ -29,12 +29,12 @@ echo "WITHOUT ADDITIONAL ACCEPTING CONDITIONS"
for d in 0.001 0.002 0.01; do for d in 0.001 0.002 0.01; do
echo "density: $d" echo "density: $d"
$RANDTGBA -d $d $opts $RANDTGBA -A "$ALGORITHMS" -d $d $opts
done done
echo "WITH 3 ADDITIONAL ACCEPTING CONDITIONS" echo "WITH 3 ADDITIONAL ACCEPTING CONDITIONS"
for d in 0.001 0.002 0.01; do for d in 0.001 0.002 0.01; do
echo "density: $d" echo "density: $d"
$RANDTGBA -a 3 0.0133333 -d $d $opts $RANDTGBA -A "$ALGORITHMS" -a 3 0.0133333 -d $d $opts
done done

1
bench/emptchk/pml-clserv.sh
View file

@ -24,7 +24,6 @@
set -e set -e
FORMULAE=$srcdir/models/clserv.ltl FORMULAE=$srcdir/models/clserv.ltl
ALGORITHMS=$srcdir/algorithms
opts='-f -x -m' opts='-f -x -m'

1
bench/emptchk/pml-eeaean.sh
View file

@ -24,7 +24,6 @@
set -e set -e
FORMULAE=$srcdir/models/eeaean.ltl FORMULAE=$srcdir/models/eeaean.ltl
ALGORITHMS=$srcdir/algorithms
opts='-f -x -m' opts='-f -x -m'

9
src/misc/timer.cc
View file

@ -1,4 +1,4 @@
// Copyright (C) 2004 Laboratoire d'Informatique de Paris 6 (LIP6), // Copyright (C) 2004, 2005 Laboratoire d'Informatique de Paris 6 (LIP6),
// département Systèmes Répartis Coopératifs (SRC), Université Pierre // département Systèmes Répartis Coopératifs (SRC), Université Pierre
// et Marie Curie. // et Marie Curie.
// //
@ -50,8 +50,13 @@ namespace spot
<< std::endl; << std::endl;
for (tm_type::const_iterator i = tm.begin(); i != tm.end(); ++i) for (tm_type::const_iterator i = tm.begin(); i != tm.end(); ++i)
{ {
// truncate long keys
std::string name = i->first;
if (name.size() > 22)
name.erase(22);
const spot::timer& t = i->second.first; const spot::timer& t = i->second.first;
os << std::setw(22) << i->first << " |" os << std::setw(22) << name << " |"
<< std::setw(6) << t.utime() << " " << std::setw(6) << t.utime() << " "
<< std::setw(8) << (total.utime ? << std::setw(8) << (total.utime ?
100.0 * t.utime() / total.utime : 0.) 100.0 * t.utime() / total.utime : 0.)

156
src/tgbatest/randtgba.cc
View file

@ -58,27 +58,28 @@
struct ec_algo struct ec_algo
{ {
const char* name; std::string name;
const char* options;
spot::emptiness_check_instantiator* inst; spot::emptiness_check_instantiator* inst;
}; };
ec_algo ec_algos[] = const char* default_algos[] = {
{ "Cou99(!poprem)",
{ "Cou99", "Cou99(!poprem)", 0 }, "Cou99(!poprem shy !group)",
{ "Cou99_shy-", "Cou99(!poprem shy !group)", 0 }, "Cou99(!poprem shy group)",
{ "Cou99_shy", "Cou99(!poprem shy group)", 0 }, "Cou99(poprem)",
{ "Cou99_rem", "Cou99(poprem)", 0 }, "Cou99(poprem shy !group)",
{ "Cou99_rem_shy-", "Cou99(poprem shy !group)", 0 }, "Cou99(poprem shy group)",
{ "Cou99_rem_shy", "Cou99(poprem shy group)", 0 }, "CVWY90",
{ "CVWY90", "CVWY90", 0 }, "CVWY90(bsh=4K)",
{ "CVWY90_bsh", "CVWY90(bsh=4K)", 0 }, "GV04",
{ "GV04", "GV04", 0 }, "SE05",
{ "SE05", "SE05", 0 }, "SE05(bsh=4K)",
{ "SE05_bsh", "SE05(bsh=4K)", 0 }, "Tau03",
{ "Tau03", "Tau03", 0 }, "Tau03_opt",
{ "Tau03_opt", "Tau03_opt", 0 }, 0
}; };
std::vector<ec_algo> ec_algos;
spot::emptiness_check* spot::emptiness_check*
cons_emptiness_check(int num, const spot::tgba* a, cons_emptiness_check(int num, const spot::tgba* a,
@ -132,6 +133,7 @@ syntax(char* prog)
<< " -u generate unique formulae" << std::endl << " -u generate unique formulae" << std::endl
<< std::endl << std::endl
<< "Emptiness-Check Options:" << std::endl << "Emptiness-Check Options:" << std::endl
<< " -A FILE use all algorithms listed in FILE" << std::endl
<< " -D degeneralize TGBA for emptiness-check algorithms that" << " -D degeneralize TGBA for emptiness-check algorithms that"
<< " would" << std::endl << " would" << std::endl
<< " otherwise be skipped (implies -e)" << std::endl << " otherwise be skipped (implies -e)" << std::endl
@ -139,7 +141,6 @@ syntax(char* prog)
<< "emptiness checks on N randomly generated graphs" << std::endl << "emptiness checks on N randomly generated graphs" << std::endl
<< " -m try to reduce runs, in a second pass (implies -r)" << " -m try to reduce runs, in a second pass (implies -r)"
<< std::endl << std::endl
<< " -O ALGO run Only ALGO" << std::endl
<< " -R N repeat each emptiness-check and accepting run " << " -R N repeat each emptiness-check and accepting run "
<< "computation N times" << std::endl << "computation N times" << std::endl
<< " -r compute and replay accepting runs (implies -e)" << " -r compute and replay accepting runs (implies -e)"
@ -306,18 +307,18 @@ struct stat_collector
bool total = true) const bool total = true) const
{ {
std::ios::fmtflags old = os.flags(); std::ios::fmtflags old = os.flags();
os << std::setw(22) << "" << " | " os << std::setw(25) << "" << " | "
<< std::setw(30) << std::left << title << std::right << "|" << std::endl << std::setw(30) << std::left << title << std::right << "|" << std::endl
<< std::setw(22) << "algorithm" << std::setw(25) << "algorithm"
<< " | min < mean < max | total | n" << " | min < mean < max | total | n"
<< std::endl << std::endl
<< std::setw(61) << std::setfill('-') << "" << std::setfill(' ') << std::setw(64) << std::setfill('-') << "" << std::setfill(' ')
<< std::endl; << std::endl;
os << std::right << std::fixed << std::setprecision(1); os << std::right << std::fixed << std::setprecision(1);
for (typename alg_1stat_map::const_iterator i = m.begin(); for (typename alg_1stat_map::const_iterator i = m.begin();
i != m.end(); ++i) i != m.end(); ++i)
{ {
os << std::setw(22) << i->first << " |" os << std::setw(25) << i->first << " |"
<< std::setw(6) << i->second.min << std::setw(6) << i->second.min
<< " " << " "
<< std::setw(8) << std::setw(8)
@ -333,7 +334,7 @@ struct stat_collector
<< std::setw(4) << i->second.n << std::setw(4) << i->second.n
<< std::endl; << std::endl;
} }
os << std::setw(61) << std::setfill('-') << "" << std::setfill(' ') os << std::setw(64) << std::setfill('-') << "" << std::setfill(' ')
<< std::endl; << std::endl;
os << std::setiosflags(old); os << std::setiosflags(old);
return os; return os;
@ -415,17 +416,17 @@ print_ar_stats(ar_stats_type& ar_stats, const std::string s)
std::cout << std::endl << s << std::endl; std::cout << std::endl << s << std::endl;
std::cout << std::right << std::fixed << std::setprecision(1); std::cout << std::right << std::fixed << std::setprecision(1);
std::cout << std::setw(22) << "" std::cout << std::setw(25) << ""
<< " | prefix | cycle |" << " | prefix | cycle |"
<< std::endl << std::endl
<< std::setw(22) << "algorithm" << std::setw(25) << "algorithm"
<< " | min < mean < max | min < mean < max | n" << " | min < mean < max | min < mean < max | n"
<< std::endl << std::endl
<< std::setw(79) << std::setfill('-') << "" << std::setfill(' ') << std::setw(79) << std::setfill('-') << "" << std::setfill(' ')
<< std::endl; << std::endl;
for (ar_stats_type::const_iterator i = ar_stats.begin(); for (ar_stats_type::const_iterator i = ar_stats.begin();
i != ar_stats.end(); ++i) i != ar_stats.end(); ++i)
std::cout << std::setw(22) << i->first << " |" std::cout << std::setw(25) << i->first << " |"
<< std::setw(6) << i->second.min_prefix << std::setw(6) << i->second.min_prefix
<< " " << " "
<< std::setw(8) << std::setw(8)
@ -444,17 +445,17 @@ print_ar_stats(ar_stats_type& ar_stats, const std::string s)
<< std::endl; << std::endl;
std::cout << std::setw(79) << std::setfill('-') << "" << std::setfill(' ') std::cout << std::setw(79) << std::setfill('-') << "" << std::setfill(' ')
<< std::endl << std::endl
<< std::setw(22) << "" << std::setw(25) << ""
<< " | runs | total |" << " | runs | total |"
<< std::endl << << std::endl <<
std::setw(22) << "algorithm" std::setw(25) << "algorithm"
<< " | min < mean < max | pre. cyc. runs | n" << " | min < mean < max | pre. cyc. runs | n"
<< std::endl << std::endl
<< std::setw(79) << std::setfill('-') << "" << std::setfill(' ') << std::setw(79) << std::setfill('-') << "" << std::setfill(' ')
<< std::endl; << std::endl;
for (ar_stats_type::const_iterator i = ar_stats.begin(); for (ar_stats_type::const_iterator i = ar_stats.begin();
i != ar_stats.end(); ++i) i != ar_stats.end(); ++i)
std::cout << std::setw(22) << i->first << " |" std::cout << std::setw(25) << i->first << " |"
<< std::setw(6) << std::setw(6)
<< i->second.min_run << i->second.min_run
<< " " << " "
@ -531,6 +532,7 @@ generate_formula(const spot::ltl::random_ltl& rl, int opt_f, int opt_s,
int int
main(int argc, char** argv) main(int argc, char** argv)
{ {
bool opt_A;
bool opt_paper = false; bool opt_paper = false;
bool opt_dp = false; bool opt_dp = false;
int opt_f = 15; int opt_f = 15;
@ -553,8 +555,6 @@ main(int argc, char** argv)
int opt_R = 0; int opt_R = 0;
const char* opt_O = 0;
bool opt_dot = false; bool opt_dot = false;
int opt_ec = 0; int opt_ec = 0;
int opt_ec_seed = 0; int opt_ec_seed = 0;
@ -595,6 +595,41 @@ main(int argc, char** argv)
opt_n_acc = to_int_nonneg(argv[++argn], "-a"); opt_n_acc = to_int_nonneg(argv[++argn], "-a");
opt_a = to_float_nonneg(argv[++argn], "-a"); opt_a = to_float_nonneg(argv[++argn], "-a");
} }
else if (!strcmp(argv[argn], "-A"))
{
if (argc < argn + 2)
syntax(argv[0]);
opt_A = true;
std::istream* in;
if (strcmp(argv[++argn], "-"))
{
in = new std::ifstream(argv[argn]);
if (!*in)
{
delete in;
std::cerr << "Failed to open " << argv[argn] << std::endl;
exit(2);
}
}
else
{
in = &std::cin;
}
while (in->good())
{
std::string input;
if (std::getline(*in, input, '\n').fail())
break;
else if (input == "")
break;
ec_algo a = { input, 0 };
ec_algos.push_back(a);
}
if (in != &std::cin)
delete in;
}
else if (!strncmp(argv[argn], "ar:", 3)) else if (!strncmp(argv[argn], "ar:", 3))
{ {
if (options.parse_options(argv[argn])) if (options.parse_options(argv[argn]))
@ -656,25 +691,6 @@ main(int argc, char** argv)
syntax(argv[0]); syntax(argv[0]);
opt_n = to_int_pos(argv[++argn], "-n"); opt_n = to_int_pos(argv[++argn], "-n");
} }
else if (!strcmp(argv[argn], "-O"))
{
if (argc < argn + 2)
syntax(argv[0]);
opt_O = argv[++argn];
int s = sizeof(ec_algos) / sizeof(*ec_algos);
int i;
for (i = 0; i < s; ++i)
if (!strcmp(opt_O, ec_algos[i].name))
break;
if (i == s)
{
std::cerr << "Unknown algorithm. Available algorithms are:"
<< std::endl;
for (i = 0; i < s; ++i)
std::cerr << " " << ec_algos[i].name << std::endl;
exit(1);
}
}
else if (!strcmp(argv[argn], "-r")) else if (!strcmp(argv[argn], "-r"))
{ {
opt_replay = true; opt_replay = true;
@ -769,6 +785,16 @@ main(int argc, char** argv)
exit(0); exit(0);
} }
if (ec_algos.empty())
{
const char** i = default_algos;
while (*i)
{
ec_algo a = { *i++, 0 };
ec_algos.push_back(a);
}
}
spot::timer_map tm_ec; spot::timer_map tm_ec;
spot::timer_map tm_ar; spot::timer_map tm_ar;
std::set<int> failed_seeds; std::set<int> failed_seeds;
@ -777,11 +803,12 @@ main(int argc, char** argv)
if (opt_ec) if (opt_ec)
{ {
for (unsigned i = 0; i < sizeof(ec_algos) / sizeof(*ec_algos); ++i) for (unsigned i = 0; i < ec_algos.size(); ++i)
{ {
const char* err; const char* err;
ec_algos[i].inst = ec_algos[i].inst =
spot::emptiness_check_instantiator::construct(ec_algos[i].options, spot::emptiness_check_instantiator::construct(ec_algos[i]
.name.c_str(),
&err); &err);
if (ec_algos[i].inst == 0) if (ec_algos[i].inst == 0)
{ {
@ -871,7 +898,7 @@ main(int argc, char** argv)
if (opt_degen && real_n_acc > 1) if (opt_degen && real_n_acc > 1)
degen = new spot::tgba_tba_proxy(a); degen = new spot::tgba_tba_proxy(a);
int n_alg = sizeof(ec_algos) / sizeof(*ec_algos); int n_alg = ec_algos.size();
int n_ec = 0; int n_ec = 0;
int n_empty = 0; int n_empty = 0;
int n_non_empty = 0; int n_non_empty = 0;
@ -881,13 +908,11 @@ main(int argc, char** argv)
{ {
spot::emptiness_check* ec; spot::emptiness_check* ec;
spot::emptiness_check_result* res; spot::emptiness_check_result* res;
if (opt_O && strcmp(opt_O, ec_algos[i].name))
continue;
ec = cons_emptiness_check(i, a, degen, real_n_acc); ec = cons_emptiness_check(i, a, degen, real_n_acc);
if (!ec) if (!ec)
continue; continue;
++n_ec; ++n_ec;
const char* algo = ec_algos[i].name; const std::string algo = ec_algos[i].name;
if (!opt_paper) if (!opt_paper)
{ {
std::cout.width(32); std::cout.width(32);
@ -1139,13 +1164,13 @@ main(int argc, char** argv)
ec_ratio_stat_type::stats_alg_map& stats = glob_ec_ratio_stats.stats; ec_ratio_stat_type::stats_alg_map& stats = glob_ec_ratio_stats.stats;
typedef ec_ratio_stat_type::alg_1stat_map::const_iterator ec_iter; typedef ec_ratio_stat_type::alg_1stat_map::const_iterator ec_iter;
for (unsigned i = 0; i < sizeof(ec_algos) / sizeof(*ec_algos); ++i) for (unsigned i = 0; i < ec_algos.size(); ++i)
{ {
const char* algo = ec_algos[i].name; const std::string algo = ec_algos[i].name;
int n = -1; int n = -1;
std::cout << std::setw(22) << algo << " " << std::setw(8); std::cout << std::setw(25) << algo << " " << std::setw(8);
ec_iter i = stats["states"].find(algo); ec_iter i = stats["states"].find(algo);
if (i != stats["states"].end()) if (i != stats["states"].end())
@ -1184,11 +1209,11 @@ main(int argc, char** argv)
std::cout << std::right << std::fixed << std::setprecision(1); std::cout << std::right << std::fixed << std::setprecision(1);
ec_ratio_stat_type::stats_alg_map& stats2 = arc_ratio_stats.stats; ec_ratio_stat_type::stats_alg_map& stats2 = arc_ratio_stats.stats;
for (unsigned i = 0; i < sizeof(ec_algos) / sizeof(*ec_algos); ++i) for (unsigned i = 0; i < ec_algos.size(); ++i)
{ {
const char* algo = ec_algos[i].name; const std::string algo = ec_algos[i].name;
std::cout << std::setw(22) << algo << " " << std::setw(8); std::cout << std::setw(25) << algo << " " << std::setw(8);
ec_iter i = stats2["search space states"].find(algo); ec_iter i = stats2["search space states"].find(algo);
if (i != stats2["search space states"].end()) if (i != stats2["search space states"].end())
@ -1225,6 +1250,11 @@ main(int argc, char** argv)
dynamic_cast<std::ifstream*>(formula_file)->close(); dynamic_cast<std::ifstream*>(formula_file)->close();
delete formula_file; delete formula_file;
} }
if (opt_ec)
for (unsigned i = 0; i < ec_algos.size(); ++i)
delete ec_algos[i].inst;
delete ap; delete ap;
delete apf; delete apf;
delete dict; delete dict;