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

stutter bench: fix so that is compile again

Browse source 
* bench/stutter/stutter_invariance_formulas.cc,
bench/stutter/stutter_invariance_randomgraph.cc: Adjust after the
tgba->twa changes.
This commit is contained in:
Alexandre Duret-Lutz 2015-06-04 20:51:03 +02:00
parent 98790f5345
commit 0cf952e793
2 changed files with 19 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

18
bench/stutter/stutter_invariance_formulas.cc
View file

@ -21,10 +21,10 @@
#include "bin/common_setup.hh" #include "bin/common_setup.hh"
#include "bin/common_finput.hh" #include "bin/common_finput.hh"
#include "bin/common_output.hh" #include "bin/common_output.hh"
#include "tgbaalgos/translate.hh" #include "twaalgos/translate.hh"
#include "tgbaalgos/stutter.hh" #include "twaalgos/stutter.hh"
#include "tgbaalgos/dupexp.hh" #include "twaalgos/dupexp.hh"
#include "tgbaalgos/stats.hh" #include "twaalgos/stats.hh"
#include "ltlast/allnodes.hh" #include "ltlast/allnodes.hh"
#include "ltlvisit/apcollect.hh" #include "ltlvisit/apcollect.hh"
#include "ltlvisit/length.hh" #include "ltlvisit/length.hh"
@ -70,8 +70,8 @@ namespace
const spot::ltl::formula* nf = const spot::ltl::formula* nf =
spot::ltl::unop::instance(spot::ltl::unop::Not, spot::ltl::unop::instance(spot::ltl::unop::Not,
f->clone()); f->clone());
spot::tgba_digraph_ptr a = trans.run(f); spot::twa_graph_ptr a = trans.run(f);
spot::tgba_digraph_ptr na = trans.run(nf); spot::twa_graph_ptr na = trans.run(nf);
spot::ltl::atomic_prop_set* ap = spot::ltl::atomic_prop_collect(f); spot::ltl::atomic_prop_set* ap = spot::ltl::atomic_prop_collect(f);
bdd apdict = spot::ltl::atomic_prop_collect_as_bdd(f, a); bdd apdict = spot::ltl::atomic_prop_collect_as_bdd(f, a);
@ -82,10 +82,8 @@ namespace
bool prev = true; bool prev = true;
for (int algo = 1; algo <= 8; ++algo) for (int algo = 1; algo <= 8; ++algo)
{ {
auto dup_a = spot::make_tgba_digraph(a, auto dup_a = spot::make_twa_graph(a, spot::twa::prop_set::all());
spot::tgba::prop_set::all()); auto dup_na = spot::make_twa_graph(na, spot::twa::prop_set::all());
auto dup_na = spot::make_tgba_digraph(na,
spot::tgba::prop_set::all());
spot::stopwatch sw; spot::stopwatch sw;
sw.start(); sw.start();

23
bench/stutter/stutter_invariance_randomgraph.cc
View file

@ -19,13 +19,13 @@
#include "misc/timer.hh" #include "misc/timer.hh"
#include "ltlvisit/apcollect.hh" #include "ltlvisit/apcollect.hh"
#include "tgbaalgos/dtgbacomp.hh" #include "twaalgos/dtgbacomp.hh"
#include "tgbaalgos/randomgraph.hh" #include "twaalgos/randomgraph.hh"
#include "tgbaalgos/dotty.hh" #include "twaalgos/dotty.hh"
#include "tgbaalgos/product.hh" #include "twaalgos/product.hh"
#include "tgbaalgos/stutter.hh" #include "twaalgos/stutter.hh"
#include "tgbaalgos/stats.hh" #include "twaalgos/stats.hh"
#include "twa/tgbagraph.hh" #include "twa/twagraph.hh"
#include "twa/bdddict.hh" #include "twa/bdddict.hh"
#include "misc/random.hh" #include "misc/random.hh"
#include <cstdio> #include <cstdio>
@ -72,7 +72,7 @@ main(int argc, char** argv)
// generate n random automata // generate n random automata
for (unsigned i = 0; i < n; ++i) for (unsigned i = 0; i < n; ++i)
{ {
spot::tgba_digraph_ptr a; spot::twa_graph_ptr a;
do do
{ {
spot::srand(++seed); spot::srand(++seed);
@ -93,10 +93,9 @@ main(int argc, char** argv)
if (disable_algo[algo - 1]) if (disable_algo[algo - 1])
continue; continue;
auto dup_a = spot::make_tgba_digraph(a, auto dup_a = spot::make_twa_graph(a, spot::twa::prop_set::all());
spot::tgba::prop_set::all()); auto dup_na = spot::make_twa_graph(na,
auto dup_na = spot::make_tgba_digraph(na, spot::twa::prop_set::all());
spot::tgba::prop_set::all());
spot::stopwatch sw; spot::stopwatch sw;
sw.start(); sw.start();