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

* src/tgbaalgos/minimizerun.cc, src/tgbaalgos/minimizerun.hh

Browse source 
(minimize_run): Rename as ...
* src/tgbaalgos/reducerun.cc, src/tgbaalgos/reducerun.hh:
(reduce_run): ... this.
* src/tgbaalgos/Makefile.am, src/tgbatest/ltl2tgba.cc,
src/tgbatest/randtgba.cc: Adjust all references.
This commit is contained in:
Alexandre Duret-Lutz 2004-11-29 10:01:08 +00:00
parent 3c9f4c6d0d
commit e58743dbb7
6 changed files with 39 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,5 +1,12 @@
2004-11-29 Alexandre Duret-Lutz <adl@src.lip6.fr> 2004-11-29 Alexandre Duret-Lutz <adl@src.lip6.fr>
* src/tgbaalgos/minimizerun.cc, src/tgbaalgos/minimizerun.hh
(minimize_run): Rename as ...
* src/tgbaalgos/reducerun.cc, src/tgbaalgos/reducerun.hh:
(reduce_run): ... this.
* src/tgbaalgos/Makefile.am, src/tgbatest/ltl2tgba.cc,
src/tgbatest/randtgba.cc: Adjust all references.
* src/tgbatest/emptchkr.test: Try degeneralized automata. * src/tgbatest/emptchkr.test: Try degeneralized automata.
* src/tgbatest/randtgba.cc (main): Pass the correct automaton to * src/tgbatest/randtgba.cc (main): Pass the correct automaton to
minimize_run(). minimize_run().

4
src/tgbaalgos/Makefile.am
View file

@ -38,12 +38,12 @@ tgbaalgos_HEADERS = \
ltl2tgba_fm.hh \ ltl2tgba_fm.hh \
ltl2tgba_lacim.hh \ ltl2tgba_lacim.hh \
magic.hh \ magic.hh \
minimizerun.hh \
neverclaim.hh \ neverclaim.hh \
powerset.hh \ powerset.hh \
projrun.hh \ projrun.hh \
randomgraph.hh \ randomgraph.hh \
reachiter.hh \ reachiter.hh \
reducerun.hh \
replayrun.hh \ replayrun.hh \
rundotdec.hh \ rundotdec.hh \
save.hh \ save.hh \
@ -66,12 +66,12 @@ libtgbaalgos_la_SOURCES = \
ltl2tgba_fm.cc \ ltl2tgba_fm.cc \
ltl2tgba_lacim.cc \ ltl2tgba_lacim.cc \
magic.cc \ magic.cc \
minimizerun.cc \
neverclaim.cc \ neverclaim.cc \
powerset.cc \ powerset.cc \
projrun.cc \ projrun.cc \
randomgraph.cc \ randomgraph.cc \
reachiter.cc \ reachiter.cc \
reducerun.cc \
replayrun.cc \ replayrun.cc \
rundotdec.cc \ rundotdec.cc \
save.cc \ save.cc \

4
src/tgbaalgos/minimizerun.cc → src/tgbaalgos/reducerun.cc
View file

@ -23,7 +23,7 @@
#include "emptiness.hh" #include "emptiness.hh"
#include "tgba/tgba.hh" #include "tgba/tgba.hh"
#include "bfssteps.hh" #include "bfssteps.hh"
#include "minimizerun.hh" #include "reducerun.hh"
namespace spot namespace spot
{ {
@ -89,7 +89,7 @@ namespace spot
} }
tgba_run* tgba_run*
minimize_run(const tgba* a, const tgba_run* org) reduce_run(const tgba* a, const tgba_run* org)
{ {
tgba_run* res = new tgba_run; tgba_run* res = new tgba_run;
state_set ss; state_set ss;

11
src/tgbaalgos/minimizerun.hh → src/tgbaalgos/reducerun.hh
View file

@ -19,19 +19,20 @@
// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA // Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA. // 02111-1307, USA.
#ifndef SPOT_TGBAALGOS_MINIMIZERUN_HH #ifndef SPOT_TGBAALGOS_REDUCERUN_HH
# define SPOT_TGBAALGOS_MINIMIZERUN_HH # define SPOT_TGBAALGOS_REDUCERUN_HH
namespace spot namespace spot
{ {
class tgba; class tgba;
class tgba_run; class tgba_run;
/// \brief Minimize an accepting run. /// \brief Reduce an accepting run.
/// \ingroup tgba_run
/// ///
/// Return a run which is accepting for \a and that is no longer /// Return a run which is accepting for \a and that is no longer
/// that \a org. /// that \a org.
tgba_run* minimize_run(const tgba* a, const tgba_run* org); tgba_run* reduce_run(const tgba* a, const tgba_run* org);
} }
#endif // SPOT_TGBAALGOS_MINIMIZERUN_HH #endif // SPOT_TGBAALGOS_REDUCERUN_HH

16
src/tgbatest/ltl2tgba.cc
View file

@ -37,7 +37,7 @@
#include "tgba/tgbatba.hh" #include "tgba/tgbatba.hh"
#include "tgbaalgos/gv04.hh" #include "tgbaalgos/gv04.hh"
#include "tgbaalgos/magic.hh" #include "tgbaalgos/magic.hh"
#include "tgbaalgos/minimizerun.hh" #include "tgbaalgos/reducerun.hh"
#include "tgbaalgos/se05.hh" #include "tgbaalgos/se05.hh"
#include "tgbaalgos/tau03.hh" #include "tgbaalgos/tau03.hh"
#include "tgbaalgos/tau03opt.hh" #include "tgbaalgos/tau03opt.hh"
@ -75,7 +75,7 @@ syntax(char* prog)
<< " -g graph the accepting run on the automaton (requires -e)" << " -g graph the accepting run on the automaton (requires -e)"
<< std::endl << std::endl
<< " -L fair-loop approximation (implies -f)" << std::endl << " -L fair-loop approximation (implies -f)" << std::endl
<< " -m try to minimize accepting runs, in a second pass" << " -m try to reduce accepting runs, in a second pass"
<< std::endl << std::endl
<< " -N display the never clain for Spin " << " -N display the never clain for Spin "
<< "(implies -D)" << std::endl << "(implies -D)" << std::endl
@ -170,7 +170,7 @@ main(int argc, char** argv)
bool post_branching = false; bool post_branching = false;
bool fair_loop_approx = false; bool fair_loop_approx = false;
bool graph_run_opt = false; bool graph_run_opt = false;
bool opt_minim = false; bool opt_reduce = false;
spot::ltl::environment& env(spot::ltl::default_environment::instance()); spot::ltl::environment& env(spot::ltl::default_environment::instance());
spot::ltl::atomic_prop_set* unobservables = 0; spot::ltl::atomic_prop_set* unobservables = 0;
@ -248,7 +248,7 @@ main(int argc, char** argv)
} }
else if (!strcmp(argv[formula_index], "-m")) else if (!strcmp(argv[formula_index], "-m"))
{ {
opt_minim = true; opt_reduce = true;
} }
else if (!strcmp(argv[formula_index], "-N")) else if (!strcmp(argv[formula_index], "-N"))
{ {
@ -734,12 +734,12 @@ main(int argc, char** argv)
} }
else else
{ {
if (opt_minim) if (opt_reduce)
{ {
spot::tgba_run* mini = spot::tgba_run* redrun =
spot::minimize_run(res->automaton(), run); spot::reduce_run(res->automaton(), run);
delete run; delete run;
run = mini; run = redrun;
} }
if (graph_run_opt) if (graph_run_opt)
{ {

28
src/tgbatest/randtgba.cc
View file

@ -39,7 +39,7 @@
#include "tgbaalgos/gtec/gtec.hh" #include "tgbaalgos/gtec/gtec.hh"
#include "tgbaalgos/gv04.hh" #include "tgbaalgos/gv04.hh"
#include "tgbaalgos/magic.hh" #include "tgbaalgos/magic.hh"
#include "tgbaalgos/minimizerun.hh" #include "tgbaalgos/reducerun.hh"
#include "tgbaalgos/se05.hh" #include "tgbaalgos/se05.hh"
#include "tgbaalgos/tau03.hh" #include "tgbaalgos/tau03.hh"
#include "tgbaalgos/tau03opt.hh" #include "tgbaalgos/tau03opt.hh"
@ -61,7 +61,7 @@ syntax(char* prog)
<< " -e N compare result of all " << " -e N compare result of all "
<< "emptiness checks on N randomly generated graphs" << std::endl << "emptiness checks on N randomly generated graphs" << std::endl
<< " -g output in dot format" << std::endl << " -g output in dot format" << std::endl
<< " -m try to minimize runs, in a second pass (implies -r)" << " -m try to reduce runs, in a second pass (implies -r)"
<< std::endl << std::endl
<< " -n N number of nodes of the graph [20]" << std::endl << " -n N number of nodes of the graph [20]" << std::endl
<< " -r compute and replay acceptance runs (implies -e)" << " -r compute and replay acceptance runs (implies -e)"
@ -278,7 +278,7 @@ main(int argc, char** argv)
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;
bool opt_minim = false; bool opt_reduce = false;
bool opt_replay = false; bool opt_replay = false;
bool opt_degen = false; bool opt_degen = false;
int argn = 0; int argn = 0;
@ -324,7 +324,7 @@ main(int argc, char** argv)
} }
else if (!strcmp(argv[argn], "-m")) else if (!strcmp(argv[argn], "-m"))
{ {
opt_minim = true; opt_reduce = true;
opt_replay = true; opt_replay = true;
if (!opt_ec) if (!opt_ec)
opt_ec = 1; opt_ec = 1;
@ -488,12 +488,12 @@ main(int argc, char** argv)
<< "+" << run->cycle.size() << "+" << run->cycle.size()
<< "]"; << "]";
if (opt_minim) if (opt_reduce)
{ {
spot::tgba_run* minrun = spot::tgba_run* redrun =
spot::minimize_run(res->automaton(), run); spot::reduce_run(res->automaton(), run);
if (!spot::replay_tgba_run(s, res->automaton(), if (!spot::replay_tgba_run(s, res->automaton(),
minrun)) redrun))
{ {
std::cout << ", but could not replay " std::cout << ", but could not replay "
<< "its minimization (ERROR!)"; << "its minimization (ERROR!)";
@ -501,17 +501,17 @@ main(int argc, char** argv)
} }
else else
{ {
std::cout << ", minimized"; std::cout << ", reduced";
if (opt_z) if (opt_z)
mar_stats[algo].count(minrun); mar_stats[algo].count(redrun);
} }
if (opt_z) if (opt_z)
{ {
std::cout << " [" << minrun->prefix.size() std::cout << " [" << redrun->prefix.size()
<< "+" << minrun->cycle.size() << "+" << redrun->cycle.size()
<< "]"; << "]";
} }
delete minrun; delete redrun;
} }
delete run; delete run;
} }
@ -628,7 +628,7 @@ main(int argc, char** argv)
if (!mar_stats.empty()) if (!mar_stats.empty())
{ {
std::cout << std::endl std::cout << std::endl
<< "Statistics about minimized accepting runs:" << std::endl; << "Statistics about reduced accepting runs:" << std::endl;
print_ar_stats(mar_stats); print_ar_stats(mar_stats);
} }