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

Rename files related to Safra complementation.

Browse source 
* src/tgba/tgbacomplement.cc, src/tgba/tgbacomplement.hh: Rename
as...
* src/tgba/tgbasafracomplement.cc,
src/tgba/tgbasafracomplement.hh: ... these, and adjust class name.
* src/tgba/Makefile.am, src/tgbatest/Makefile.am: Adjust.
* src/tgbatest/complementation.cc: Adjust.
This commit is contained in:
Guillaume Sadegh 2009-09-21 11:53:07 +02:00
parent 1208365b8c
commit 9775dd9701
6 changed files with 55 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2009-09-21 Guillaume Sadegh <sadegh@lrde.epita.fr>
Rename files related to Safra complementation.
* src/tgba/tgbacomplement.cc, src/tgba/tgbacomplement.hh: Rename
as...
* src/tgba/tgbasafracomplement.cc,
src/tgba/tgbasafracomplement.hh: ... these, and adjust class name.
* src/tgba/Makefile.am, src/tgbatest/Makefile.am: Adjust.
* src/tgbatest/complementation.cc: Adjust.
2009-09-28 Alexandre Duret-Lutz <adl@lrde.epita.fr> 2009-09-28 Alexandre Duret-Lutz <adl@lrde.epita.fr>
Fix previous patch. Fix previous patch.

4
src/tgba/Makefile.am
View file

@ -41,7 +41,7 @@ tgba_HEADERS = \
tgbabddcoredata.hh \ tgbabddcoredata.hh \
tgbabddfactory.hh \ tgbabddfactory.hh \
tgbascc.hh \ tgbascc.hh \
tgbacomplement.hh \ tgbasafracomplement.hh \
tgbaexplicit.hh \ tgbaexplicit.hh \
tgbaproduct.hh \ tgbaproduct.hh \
tgbatba.hh \ tgbatba.hh \
@ -63,7 +63,7 @@ libtgba_la_SOURCES = \
tgbabddconcreteproduct.cc \ tgbabddconcreteproduct.cc \
tgbabddcoredata.cc \ tgbabddcoredata.cc \
tgbascc.cc \ tgbascc.cc \
tgbacomplement.cc \ tgbasafracomplement.cc \
tgbaexplicit.cc \ tgbaexplicit.cc \
tgbaproduct.cc \ tgbaproduct.cc \
tgbatba.cc \ tgbatba.cc \

54
src/tgba/tgbacomplement.cc → src/tgba/tgbasafracomplement.cc
View file

@ -34,7 +34,7 @@
#include "ltlast/formula.hh" #include "ltlast/formula.hh"
#include "ltlast/constant.hh" #include "ltlast/constant.hh"
#include "tgbaalgos/dotty.hh" #include "tgbaalgos/dotty.hh"
#include "tgba/tgbacomplement.hh" #include "tgba/tgbasafracomplement.hh"
namespace spot namespace spot
{ {
@ -848,7 +848,7 @@ namespace spot
//////////////////////////////////////// ////////////////////////////////////////
// state_complement // state_complement
/// States used by spot::tgba_complement. /// States used by spot::tgba_safra_complement.
/// \ingroup tgba_representation /// \ingroup tgba_representation
class state_complement : public state class state_complement : public state
{ {
@ -979,21 +979,21 @@ namespace spot
return ss.str(); return ss.str();
} }
/// Successor iterators used by spot::tgba_complement. /// Successor iterators used by spot::tgba_safra_complement.
/// \ingroup tgba_representation /// \ingroup tgba_representation
class tgba_complement_succ_iterator: public tgba_succ_iterator class tgba_safra_complement_succ_iterator: public tgba_succ_iterator
{ {
public: public:
typedef std::multimap<bdd, state_complement*, bdd_less_than> succ_list_t; typedef std::multimap<bdd, state_complement*, bdd_less_than> succ_list_t;
tgba_complement_succ_iterator(const succ_list_t& list, tgba_safra_complement_succ_iterator(const succ_list_t& list,
bdd the_acceptance_cond) bdd the_acceptance_cond)
: list_(list), the_acceptance_cond_(the_acceptance_cond) : list_(list), the_acceptance_cond_(the_acceptance_cond)
{ {
} }
virtual virtual
~tgba_complement_succ_iterator() ~tgba_safra_complement_succ_iterator()
{ {
for (succ_list_t::iterator i = list_.begin(); i != list_.end(); ++i) for (succ_list_t::iterator i = list_.begin(); i != list_.end(); ++i)
delete i->second; delete i->second;
@ -1012,39 +1012,39 @@ namespace spot
}; };
void void
tgba_complement_succ_iterator::first() tgba_safra_complement_succ_iterator::first()
{ {
it_ = list_.begin(); it_ = list_.begin();
} }
void void
tgba_complement_succ_iterator::next() tgba_safra_complement_succ_iterator::next()
{ {
++it_; ++it_;
} }
bool bool
tgba_complement_succ_iterator::done() const tgba_safra_complement_succ_iterator::done() const
{ {
return it_ == list_.end(); return it_ == list_.end();
} }
state_complement* state_complement*
tgba_complement_succ_iterator::current_state() const tgba_safra_complement_succ_iterator::current_state() const
{ {
assert(!done()); assert(!done());
return new state_complement(*(it_->second)); return new state_complement(*(it_->second));
} }
bdd bdd
tgba_complement_succ_iterator::current_condition() const tgba_safra_complement_succ_iterator::current_condition() const
{ {
assert(!done()); assert(!done());
return it_->first; return it_->first;
} }
bdd bdd
tgba_complement_succ_iterator::current_acceptance_conditions() const tgba_safra_complement_succ_iterator::current_acceptance_conditions() const
{ {
assert(!done()); assert(!done());
return the_acceptance_cond_; return the_acceptance_cond_;
@ -1101,10 +1101,10 @@ namespace spot
// End of the safra construction // End of the safra construction
////////////////////////////////////////// //////////////////////////////////////////
// tgba_complement // tgba_safra_complement
////////////////////////// //////////////////////////
tgba_complement::tgba_complement(const tgba* a) tgba_safra_complement::tgba_safra_complement(const tgba* a)
: automaton_(a), safra_(safra_determinisation::create_safra_automaton(a)) : automaton_(a), safra_(safra_determinisation::create_safra_automaton(a))
{ {
assert(safra_ || "safra construction fails"); assert(safra_ || "safra construction fails");
@ -1134,14 +1134,14 @@ namespace spot
} }
tgba_complement::~tgba_complement() tgba_safra_complement::~tgba_safra_complement()
{ {
get_dict()->unregister_all_my_variables(safra_); get_dict()->unregister_all_my_variables(safra_);
delete safra_; delete safra_;
} }
state* state*
tgba_complement::get_init_state() const tgba_safra_complement::get_init_state() const
{ {
bitset_t empty(safra_->get_nb_acceptance_pairs()); bitset_t empty(safra_->get_nb_acceptance_pairs());
return new state_complement(empty, empty, safra_->get_initial_state(), return new state_complement(empty, empty, safra_->get_initial_state(),
@ -1184,7 +1184,7 @@ namespace spot
/// @param local_state /// @param local_state
/// ///
tgba_succ_iterator* tgba_succ_iterator*
tgba_complement::succ_iter(const state* local_state, tgba_safra_complement::succ_iter(const state* local_state,
const state* /* = 0 */, const state* /* = 0 */,
const tgba* /* = 0 */) const const tgba* /* = 0 */) const
{ {
@ -1199,7 +1199,7 @@ namespace spot
if (tr != safra_->automaton.end()) if (tr != safra_->automaton.end())
{ {
bdd condition = bddfalse; bdd condition = bddfalse;
tgba_complement_succ_iterator::succ_list_t succ_list; tgba_safra_complement_succ_iterator::succ_list_t succ_list;
int nb_acceptance_pairs = safra_->get_nb_acceptance_pairs(); int nb_acceptance_pairs = safra_->get_nb_acceptance_pairs();
bitset_t e(nb_acceptance_pairs); bitset_t e(nb_acceptance_pairs);
@ -1266,20 +1266,20 @@ namespace spot
#endif #endif
} }
return new tgba_complement_succ_iterator(succ_list, condition); return new tgba_safra_complement_succ_iterator(succ_list, condition);
} }
assert("Safra automaton does not find this node"); assert("Safra automaton does not find this node");
return 0; return 0;
} }
bdd_dict* bdd_dict*
tgba_complement::get_dict() const tgba_safra_complement::get_dict() const
{ {
return automaton_->get_dict(); return automaton_->get_dict();
} }
std::string std::string
tgba_complement::format_state(const state* state) const tgba_safra_complement::format_state(const state* state) const
{ {
const state_complement* s = const state_complement* s =
dynamic_cast<const state_complement*>(state); dynamic_cast<const state_complement*>(state);
@ -1288,7 +1288,7 @@ namespace spot
} }
bdd bdd
tgba_complement::all_acceptance_conditions() const tgba_safra_complement::all_acceptance_conditions() const
{ {
#if TRANSFORM_TO_TBA #if TRANSFORM_TO_TBA
return the_acceptance_cond_; return the_acceptance_cond_;
@ -1298,7 +1298,7 @@ namespace spot
} }
bdd bdd
tgba_complement::neg_acceptance_conditions() const tgba_safra_complement::neg_acceptance_conditions() const
{ {
#if TRANSFORM_TO_TBA #if TRANSFORM_TO_TBA
return !the_acceptance_cond_; return !the_acceptance_cond_;
@ -1308,7 +1308,7 @@ namespace spot
} }
bdd bdd
tgba_complement::compute_support_conditions(const state* state) const tgba_safra_complement::compute_support_conditions(const state* state) const
{ {
const state_complement* s = dynamic_cast<const state_complement*>(state); const state_complement* s = dynamic_cast<const state_complement*>(state);
assert(s); assert(s);
@ -1328,7 +1328,7 @@ namespace spot
} }
bdd bdd
tgba_complement::compute_support_variables(const state* state) const tgba_safra_complement::compute_support_variables(const state* state) const
{ {
const state_complement* s = dynamic_cast<const state_complement*>(state); const state_complement* s = dynamic_cast<const state_complement*>(state);
assert(s); assert(s);
@ -1349,7 +1349,7 @@ namespace spot
// display_safra: debug routine. // display_safra: debug routine.
////////////////////////////// //////////////////////////////
void display_safra(const tgba_complement* a) void display_safra(const tgba_safra_complement* a)
{ {
test::print_safra_automaton(a->get_safra()); test::print_safra_automaton(a->get_safra());
} }

14
src/tgba/tgbacomplement.hh → src/tgba/tgbasafracomplement.hh
View file

@ -1,5 +1,5 @@
#ifndef SPOT_TGBA_TGBACOMPLEMENT_HH #ifndef SPOT_TGBA_TGBASAFRACOMPLEMENT_HH
# define SPOT_TGBA_TGBACOMPLEMENT_HH # define SPOT_TGBA_TGBASAFRACOMPLEMENT_HH
# include <vector> # include <vector>
# include "tgba/tgba.hh" # include "tgba/tgba.hh"
@ -30,11 +30,11 @@ namespace spot
/// is done on-the-fly when successors are called. /// is done on-the-fly when successors are called.
/// ///
/// \sa safra_determinisation, tgba_complement::succ_iter. /// \sa safra_determinisation, tgba_complement::succ_iter.
class tgba_complement : public tgba class tgba_safra_complement : public tgba
{ {
public: public:
tgba_complement(const tgba* a); tgba_safra_complement(const tgba* a);
virtual ~tgba_complement(); virtual ~tgba_safra_complement();
safra_tree_automaton* get_safra() const safra_tree_automaton* get_safra() const
{ {
@ -77,7 +77,7 @@ namespace spot
/// @param a The \c tgba_complement with an intermediate Safra /// @param a The \c tgba_complement with an intermediate Safra
/// automaton to display /// automaton to display
/// ///
void display_safra(const tgba_complement* a); void display_safra(const tgba_safra_complement* a);
} }
#endif // SPOT_TGBA_TGBACOMPLEMENT_HH #endif // SPOT_TGBA_TGBASAFRACOMPLEMENT_HH

2
src/tgbatest/Makefile.am
View file

@ -31,7 +31,7 @@ check_SCRIPTS = defs
# Keep this sorted alphabetically. # Keep this sorted alphabetically.
check_PROGRAMS = \ check_PROGRAMS = \
bddprod \ bddprod \
complement \ safracomplement \
explicit \ explicit \
expldot \ expldot \
explprod \ explprod \

12
src/tgbatest/complementation.cc
View file

@ -15,7 +15,7 @@
#include "ltlvisit/clone.hh" #include "ltlvisit/clone.hh"
#include "tgba/tgbatba.hh" #include "tgba/tgbatba.hh"
#include "tgba/tgbacomplement.hh" #include "tgba/tgbasafracomplement.hh"
void usage(const char* prog) void usage(const char* prog)
{ {
@ -98,7 +98,8 @@ int main(int argc, char* argv[])
if (spot::format_tgba_parse_errors(std::cerr, file, pel)) if (spot::format_tgba_parse_errors(std::cerr, file, pel))
return 2; return 2;
spot::tgba_complement* complement = new spot::tgba_complement(a); spot::tgba_safra_complement* complement =
new spot::tgba_safra_complement(a);
if (print_automaton) if (print_automaton)
spot::dotty_reachable(std::cout, complement); spot::dotty_reachable(std::cout, complement);
@ -132,7 +133,8 @@ int main(int argc, char* argv[])
return 2; return 2;
} }
spot::tgba_complement* complement = new spot::tgba_complement(a); spot::tgba_safra_complement* complement =
new spot::tgba_safra_complement(a);
spot::tgba_statistics a_size = spot::stats_reachable(a); spot::tgba_statistics a_size = spot::stats_reachable(a);
std::cout << "Original: " std::cout << "Original: "
@ -189,8 +191,8 @@ int main(int argc, char* argv[])
spot::ltl::formula* nf1 = spot::ltl::unop::instance(spot::ltl::unop::Not, spot::ltl::formula* nf1 = spot::ltl::unop::instance(spot::ltl::unop::Not,
spot::ltl::clone(f1)); spot::ltl::clone(f1));
spot::tgba* Anf = spot::ltl_to_tgba_fm(nf1, dict); spot::tgba* Anf = spot::ltl_to_tgba_fm(nf1, dict);
spot::tgba_complement* nAf = new spot::tgba_complement(Af); spot::tgba_safra_complement* nAf = new spot::tgba_safra_complement(Af);
spot::tgba_complement* nAnf = new spot::tgba_complement(Anf); spot::tgba_safra_complement* nAnf = new spot::tgba_safra_complement(Anf);
spot::tgba* prod = new spot::tgba_product(nAf, nAnf); spot::tgba* prod = new spot::tgba_product(nAf, nAnf);
spot::emptiness_check* ec = spot::couvreur99(prod); spot::emptiness_check* ec = spot::couvreur99(prod);
spot::emptiness_check_result* res = ec->check(); spot::emptiness_check_result* res = ec->check();