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

Rename tgba_complement as tgba_kv_complement.

Browse source 
* src/tgba/tgbacomplement.hh, src/tgba/tgbacomplement.cc: Rename
as...
* src/tgba/tgbakvcomplement.hh, src/tgba/tgbakvcomplement.cc:
... these. It makes more sense since we also have
tgba_safra_complement.
* src/tgba/Makefile.am, src/tgbatest/complement.cc, NEWS: Adjust.
This commit is contained in:
Alexandre Duret-Lutz 2010-01-30 11:56:45 +01:00
parent 85532dc8f8
commit 7647ba0fdd
6 changed files with 132 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2010-01-30 Alexandre Duret-Lutz <adl@lrde.epita.fr>
Rename tgba_complement as tgba_kv_complement.
* src/tgba/tgbacomplement.hh, src/tgba/tgbacomplement.cc: Rename
as...
* src/tgba/tgbakvcomplement.hh, src/tgba/tgbakvcomplement.cc:
... these. It makes more sense since we also have
tgba_safra_complement.
* src/tgba/Makefile.am, src/tgbatest/complement.cc, NEWS: Adjust.
2010-01-30 Alexandre Duret-Lutz <adl@lrde.epita.fr> 2010-01-30 Alexandre Duret-Lutz <adl@lrde.epita.fr>
Do not recognize "*" as "and". This leaves room for an Do not recognize "*" as "and". This leaves room for an

2
NEWS
View file

@ -24,7 +24,7 @@ New in spot 0.5 (2010-01-31):
(in time and memory consumption) for the LTL translation. (in time and memory consumption) for the LTL translation.
* Two complementation algorithms for state-based Büchi automata * Two complementation algorithms for state-based Büchi automata
have been implemented: have been implemented:
- tgba_complement is an on-the-fly implementation of the - tgba_kv_complement is an on-the-fly implementation of the
Kupferman-Vardi construction (TCS'05) for generalized acceptance Kupferman-Vardi construction (TCS'05) for generalized acceptance
conditions. conditions.
- tgba_safra_complement is an implementation of Safra's - tgba_safra_complement is an implementation of Safra's

6
src/tgba/Makefile.am
View file

@ -1,4 +1,4 @@
## Copyright (C) 2009 Laboratoire de Recherche et Développement ## Copyright (C) 2009, 2010 Laboratoire de Recherche et Développement
## de l'Epita (LRDE). ## de l'Epita (LRDE).
## Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6), ## Copyright (C) 2003, 2004 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
@ -43,9 +43,9 @@ tgba_HEADERS = \
tgbabddconcreteproduct.hh \ tgbabddconcreteproduct.hh \
tgbabddcoredata.hh \ tgbabddcoredata.hh \
tgbabddfactory.hh \ tgbabddfactory.hh \
tgbacomplement.hh \
tgbaexplicit.hh \ tgbaexplicit.hh \
tgbafromfile.hh \ tgbafromfile.hh \
tgbakvcomplement.hh \
tgbascc.hh \ tgbascc.hh \
tgbaproduct.hh \ tgbaproduct.hh \
tgbareduc.hh \ tgbareduc.hh \
@ -68,9 +68,9 @@ libtgba_la_SOURCES = \
tgbabddconcretefactory.cc \ tgbabddconcretefactory.cc \
tgbabddconcreteproduct.cc \ tgbabddconcreteproduct.cc \
tgbabddcoredata.cc \ tgbabddcoredata.cc \
tgbacomplement.cc \
tgbaexplicit.cc \ tgbaexplicit.cc \
tgbafromfile.cc \ tgbafromfile.cc \
tgbakvcomplement.cc \
tgbaproduct.cc \ tgbaproduct.cc \
tgbareduc.cc \ tgbareduc.cc \
tgbasafracomplement.cc \ tgbasafracomplement.cc \

191
src/tgba/tgbacomplement.cc → src/tgba/tgbakvcomplement.cc
View file

@ -1,4 +1,4 @@
// Copyright (C) 2009 Laboratoire de Recherche et Développement // Copyright (C) 2009, 2010 Laboratoire de Recherche et Développement
// de l'Epita (LRDE). // de l'Epita (LRDE).
// //
// This file is part of Spot, a model checking library. // This file is part of Spot, a model checking library.
@ -24,7 +24,7 @@
#include "bdd.h" #include "bdd.h"
#include "bddprint.hh" #include "bddprint.hh"
#include "state.hh" #include "state.hh"
#include "tgbacomplement.hh" #include "tgbakvcomplement.hh"
#include "misc/hash.hh" #include "misc/hash.hh"
#include "tgbaalgos/bfssteps.hh" #include "tgbaalgos/bfssteps.hh"
#include "misc/hashfunc.hh" #include "misc/hashfunc.hh"
@ -97,22 +97,22 @@ namespace spot
state_shared_ptr_equal> state_set; state_shared_ptr_equal> state_set;
//////////////////////////////////////// ////////////////////////////////////////
// state_complement // state_kv_complement
/// States used by spot::tgba_complement. /// States used by spot::tgba_kv_complement.
/// A state has a map of states associated to ranks, and a set /// A state has a map of states associated to ranks, and a set
/// of filtered states. /// of filtered states.
/// \ingroup tgba_representation /// \ingroup tgba_representation
class state_complement : public state class state_kv_complement : public state
{ {
public: public:
state_complement(); state_kv_complement();
state_complement(state_rank_map state_map, state_set state_filter); state_kv_complement(state_rank_map state_map, state_set state_filter);
virtual ~state_complement() {} virtual ~state_kv_complement() {}
virtual int compare(const state* other) const; virtual int compare(const state* other) const;
virtual size_t hash() const; virtual size_t hash() const;
virtual state_complement* clone() const; virtual state_kv_complement* clone() const;
void add(shared_state state, const rank_t& rank); void add(shared_state state, const rank_t& rank);
const state_rank_map& get_state_map() const; const state_rank_map& get_state_map() const;
@ -123,20 +123,21 @@ namespace spot
state_set state_filter_; state_set state_filter_;
}; };
state_complement::state_complement() state_kv_complement::state_kv_complement()
{ {
} }
state_complement::state_complement(state_rank_map state_map, state_kv_complement::state_kv_complement(state_rank_map state_map,
state_set state_filter) state_set state_filter)
: state_map_(state_map), state_filter_(state_filter) : state_map_(state_map), state_filter_(state_filter)
{ {
} }
int int
state_complement::compare(const state* o) const state_kv_complement::compare(const state* o) const
{ {
const state_complement* other = dynamic_cast<const state_complement*>(o); const state_kv_complement* other =
dynamic_cast<const state_kv_complement*>(o);
if (other == 0) if (other == 0)
return 1; return 1;
@ -185,7 +186,7 @@ namespace spot
} }
size_t size_t
state_complement::hash() const state_kv_complement::hash() const
{ {
size_t hash = 0; size_t hash = 0;
@ -211,59 +212,59 @@ namespace spot
return hash; return hash;
} }
state_complement* state_kv_complement*
state_complement::clone() const state_kv_complement::clone() const
{ {
return new state_complement(*this); return new state_kv_complement(*this);
} }
void void
state_complement::add(shared_state state, state_kv_complement::add(shared_state state,
const rank_t& rank) const rank_t& rank)
{ {
state_map_[state] = rank; state_map_[state] = rank;
} }
const state_rank_map& const state_rank_map&
state_complement::get_state_map() const state_kv_complement::get_state_map() const
{ {
return state_map_; return state_map_;
} }
const state_set& const state_set&
state_complement::get_filter_set() const state_kv_complement::get_filter_set() const
{ {
return state_filter_; return state_filter_;
} }
bool bool
state_complement::accepting() const state_kv_complement::accepting() const
{ {
return state_filter_.empty(); return state_filter_.empty();
} }
/// Successor iterators used by spot::tgba_complement. /// Successor iterators used by spot::tgba_kv_complement.
/// \ingroup tgba_representation /// \ingroup tgba_representation
/// ///
/// Since the algorithm works on-the-fly, the key components of the /// Since the algorithm works on-the-fly, the key components of the
/// algorithm are implemented in this class. /// algorithm are implemented in this class.
/// ///
/// ///
class tgba_complement_succ_iterator: public tgba_succ_iterator class tgba_kv_complement_succ_iterator: public tgba_succ_iterator
{ {
public: public:
typedef std::list<bdd> bdd_list_t; typedef std::list<bdd> bdd_list_t;
tgba_complement_succ_iterator(const tgba_sgba_proxy* automaton, tgba_kv_complement_succ_iterator(const tgba_sgba_proxy* automaton,
bdd the_acceptance_cond, bdd the_acceptance_cond,
const acc_list_t& acc_list, const acc_list_t& acc_list,
const state_complement* origin); const state_kv_complement* origin);
virtual ~tgba_complement_succ_iterator() {}; virtual ~tgba_kv_complement_succ_iterator() {};
virtual void first(); virtual void first();
virtual void next(); virtual void next();
virtual bool done() const; virtual bool done() const;
virtual state_complement* current_state() const; virtual state_kv_complement* current_state() const;
virtual bdd current_condition() const; virtual bdd current_condition() const;
virtual bdd current_acceptance_conditions() const; virtual bdd current_acceptance_conditions() const;
private: private:
@ -278,8 +279,8 @@ namespace spot
const tgba_sgba_proxy* automaton_; const tgba_sgba_proxy* automaton_;
bdd the_acceptance_cond_; bdd the_acceptance_cond_;
const acc_list_t& acc_list_; const acc_list_t& acc_list_;
const state_complement* origin_; const state_kv_complement* origin_;
const state_complement* current_state_; const state_kv_complement* current_state_;
bdd_list_t condition_list_; bdd_list_t condition_list_;
bdd_list_t::const_iterator current_condition_; bdd_list_t::const_iterator current_condition_;
state_rank_map highest_current_ranks_; state_rank_map highest_current_ranks_;
@ -287,11 +288,11 @@ namespace spot
state_set highest_state_set_; state_set highest_state_set_;
}; };
tgba_complement_succ_iterator:: tgba_kv_complement_succ_iterator::
tgba_complement_succ_iterator(const tgba_sgba_proxy* automaton, tgba_kv_complement_succ_iterator(const tgba_sgba_proxy* automaton,
bdd the_acceptance_cond, bdd the_acceptance_cond,
const acc_list_t& acc_list, const acc_list_t& acc_list,
const state_complement* origin) const state_kv_complement* origin)
: automaton_(automaton), the_acceptance_cond_(the_acceptance_cond), : automaton_(automaton), the_acceptance_cond_(the_acceptance_cond),
acc_list_(acc_list), origin_(origin) acc_list_(acc_list), origin_(origin)
{ {
@ -300,7 +301,7 @@ namespace spot
/// Insert in \a list atomic properties of the formula \a c. /// Insert in \a list atomic properties of the formula \a c.
void void
tgba_complement_succ_iterator::get_atomics(std::set<int>& list, bdd c) tgba_kv_complement_succ_iterator::get_atomics(std::set<int>& list, bdd c)
{ {
bdd current = bdd_satone(c); bdd current = bdd_satone(c);
while (current != bddtrue && current != bddfalse) while (current != bddtrue && current != bddfalse)
@ -317,7 +318,7 @@ namespace spot
/// Create the conjunction of all the atomic properties from /// Create the conjunction of all the atomic properties from
/// the successors of the current state. /// the successors of the current state.
void void
tgba_complement_succ_iterator::get_conj_list() tgba_kv_complement_succ_iterator::get_conj_list()
{ {
std::set<int> atomics; std::set<int> atomics;
condition_list_.clear(); condition_list_.clear();
@ -364,18 +365,18 @@ namespace spot
/// For each odd rank, its condition associated must not /// For each odd rank, its condition associated must not
/// be present in its tracked state. /// be present in its tracked state.
bool bool
tgba_complement_succ_iterator::is_valid_rank() const tgba_kv_complement_succ_iterator::is_valid_rank() const
{ {
for (state_rank_map::const_iterator i = current_ranks_.begin(); for (state_rank_map::const_iterator i = current_ranks_.begin();
i != current_ranks_.end(); i != current_ranks_.end();
++i) ++i)
{ {
if (i->second.rank & 1) if (i->second.rank & 1)
{ {
if ((automaton_->state_acceptance_conditions(i->first.get()) & if ((automaton_->state_acceptance_conditions(i->first.get()) &
i->second.condition.get_bdd()) != bddfalse) i->second.condition.get_bdd()) != bddfalse)
return false; return false;
} }
} }
return true; return true;
@ -388,37 +389,36 @@ namespace spot
/// When the rank is odd, its has an acceptance condition associated that /// When the rank is odd, its has an acceptance condition associated that
/// must not be in its associated state. /// must not be in its associated state.
/// \return false if there is not valid rank as successor. /// \return false if there is not valid rank as successor.
bool tgba_complement_succ_iterator::next_valid_rank() bool tgba_kv_complement_succ_iterator::next_valid_rank()
{ {
state_rank_map::const_iterator i; state_rank_map::const_iterator i;
do { do
for (i = current_ranks_.begin(); {
i != current_ranks_.end(); for (i = current_ranks_.begin(); i != current_ranks_.end(); ++i)
++i) {
{ if (i->second.rank != 0)
if (i->second.rank != 0) {
{ if (i->second.rank & 1)
if (i->second.rank & 1) {
{ if (i->second.condition.order() == 0)
if (i->second.condition.order() == 0) --i->second.rank;
--i->second.rank; else
else i->second.condition =
i->second.condition = acc_list_[i->second.condition.order() - 1];
acc_list_[i->second.condition.order() - 1]; }
} else
else {
{ --i->second.rank;
--i->second.rank; i->second.condition = acc_list_[acc_list_.size() - 1];
i->second.condition = acc_list_[acc_list_.size() - 1]; }
} break;
break; }
} else
else {
{ current_ranks_[i->first] = highest_current_ranks_[i->first];
current_ranks_[i->first] = highest_current_ranks_[i->first]; }
} }
} }
}
while ((i != current_ranks_.end()) && !is_valid_rank()); while ((i != current_ranks_.end()) && !is_valid_rank());
return i != current_ranks_.end(); return i != current_ranks_.end();
@ -427,7 +427,7 @@ namespace spot
/// \brief Create the highest rank of \a origin_ as origin and /// \brief Create the highest rank of \a origin_ as origin and
/// \a condition as successor condition. /// \a condition as successor condition.
void void
tgba_complement_succ_iterator::successor_highest_rank(bdd condition) tgba_kv_complement_succ_iterator::successor_highest_rank(bdd condition)
{ {
// Highest rank for bdd. // Highest rank for bdd.
state_rank_map sr_map = origin_->get_state_map(); state_rank_map sr_map = origin_->get_state_map();
@ -481,7 +481,7 @@ namespace spot
} }
void void
tgba_complement_succ_iterator::first() tgba_kv_complement_succ_iterator::first()
{ {
current_condition_ = condition_list_.begin(); current_condition_ = condition_list_.begin();
if (done()) if (done())
@ -494,7 +494,7 @@ namespace spot
} }
void void
tgba_complement_succ_iterator::next() tgba_kv_complement_succ_iterator::next()
{ {
if (done()) if (done())
return; return;
@ -512,13 +512,13 @@ namespace spot
} }
bool bool
tgba_complement_succ_iterator::done() const tgba_kv_complement_succ_iterator::done() const
{ {
return (current_condition_ == condition_list_.end()); return (current_condition_ == condition_list_.end());
} }
state_complement* state_kv_complement*
tgba_complement_succ_iterator::current_state() const tgba_kv_complement_succ_iterator::current_state() const
{ {
if (done()) if (done())
return 0; return 0;
@ -550,11 +550,11 @@ namespace spot
} }
} }
return new state_complement(current_ranks_, filter); return new state_kv_complement(current_ranks_, filter);
} }
bdd bdd
tgba_complement_succ_iterator::current_condition() const tgba_kv_complement_succ_iterator::current_condition() const
{ {
if (done()) if (done())
return bddfalse; return bddfalse;
@ -562,7 +562,7 @@ namespace spot
} }
bdd bdd
tgba_complement_succ_iterator::current_acceptance_conditions() const tgba_kv_complement_succ_iterator::current_acceptance_conditions() const
{ {
if (done()) if (done())
return bddfalse; return bddfalse;
@ -579,7 +579,7 @@ namespace spot
/// Retrieve all the atomic acceptance conditions of the automaton. /// Retrieve all the atomic acceptance conditions of the automaton.
/// They are inserted into \a acc_list_. /// They are inserted into \a acc_list_.
void void
tgba_complement::get_acc_list() tgba_kv_complement::get_acc_list()
{ {
bdd c = automaton_->all_acceptance_conditions(); bdd c = automaton_->all_acceptance_conditions();
bdd current = bdd_satone(c); bdd current = bdd_satone(c);
@ -596,7 +596,7 @@ namespace spot
} }
} }
tgba_complement::tgba_complement(const tgba* a) tgba_kv_complement::tgba_kv_complement(const tgba* a)
: automaton_(new tgba_sgba_proxy(a)) : automaton_(new tgba_sgba_proxy(a))
{ {
get_dict()->register_all_variables_of(automaton_, this); get_dict()->register_all_variables_of(automaton_, this);
@ -610,45 +610,46 @@ namespace spot
get_acc_list(); get_acc_list();
} }
tgba_complement::~tgba_complement() tgba_kv_complement::~tgba_kv_complement()
{ {
get_dict()->unregister_all_my_variables(this); get_dict()->unregister_all_my_variables(this);
delete automaton_; delete automaton_;
} }
state* state*
tgba_complement::get_init_state() const tgba_kv_complement::get_init_state() const
{ {
state_complement* init = new state_complement(); state_kv_complement* init = new state_kv_complement();
rank_t r = {2 * nb_states_, bdd_ordered()}; rank_t r = {2 * nb_states_, bdd_ordered()};
init->add(shared_state(automaton_->get_init_state()), r); init->add(shared_state(automaton_->get_init_state()), r);
return init; return init;
} }
tgba_succ_iterator* tgba_succ_iterator*
tgba_complement::succ_iter(const state* local_state, tgba_kv_complement::succ_iter(const state* local_state,
const state*, const state*,
const tgba*) const const tgba*) const
{ {
const state_complement* state = const state_kv_complement* state =
dynamic_cast<const state_complement*>(local_state); dynamic_cast<const state_kv_complement*>(local_state);
assert(state); assert(state);
return new tgba_complement_succ_iterator(automaton_, return new tgba_kv_complement_succ_iterator(automaton_,
the_acceptance_cond_, the_acceptance_cond_,
acc_list_, state); acc_list_, state);
} }
bdd_dict* bdd_dict*
tgba_complement::get_dict() const tgba_kv_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_kv_complement::format_state(const state* state) const
{ {
const state_complement* s = dynamic_cast<const state_complement*>(state); const state_kv_complement* s =
dynamic_cast<const state_kv_complement*>(state);
assert(s); assert(s);
std::ostringstream ss; std::ostringstream ss;
ss << "{ set: {" << std::endl; ss << "{ set: {" << std::endl;
@ -674,19 +675,19 @@ namespace spot
} }
bdd bdd
tgba_complement::all_acceptance_conditions() const tgba_kv_complement::all_acceptance_conditions() const
{ {
return the_acceptance_cond_; return the_acceptance_cond_;
} }
bdd bdd
tgba_complement::neg_acceptance_conditions() const tgba_kv_complement::neg_acceptance_conditions() const
{ {
return !the_acceptance_cond_; return !the_acceptance_cond_;
} }
bdd bdd
tgba_complement::compute_support_conditions(const state* state) const tgba_kv_complement::compute_support_conditions(const state* state) const
{ {
tgba_succ_iterator* i = succ_iter(state); tgba_succ_iterator* i = succ_iter(state);
bdd result = bddtrue; bdd result = bddtrue;
@ -697,7 +698,7 @@ namespace spot
} }
bdd bdd
tgba_complement::compute_support_variables(const state* state) const tgba_kv_complement::compute_support_variables(const state* state) const
{ {
tgba_succ_iterator* i = succ_iter(state); tgba_succ_iterator* i = succ_iter(state);
bdd result = bddtrue; bdd result = bddtrue;

22
src/tgba/tgbacomplement.hh → src/tgba/tgbakvcomplement.hh
View file

@ -1,4 +1,4 @@
// Copyright (C) 2009 Laboratoire de Recherche et Développement // Copyright (C) 2009, 2010 Laboratoire de Recherche et Développement
// de l'Epita (LRDE). // de l'Epita (LRDE).
// //
// This file is part of Spot, a model checking library. // This file is part of Spot, a model checking library.
@ -18,8 +18,8 @@
// 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_TGBA_TGBACOMPLEMENT_HH #ifndef SPOT_TGBA_TGBAKVCOMPLEMENT_HH
#define SPOT_TGBA_TGBACOMPLEMENT_HH #define SPOT_TGBA_TGBAKVCOMPLEMENT_HH
#include <vector> #include <vector>
#include "bdd.h" #include "bdd.h"
@ -77,16 +77,16 @@ namespace spot
/// } /// }
/// ///
/// The original automaton is used as a States-based Generalized /// The original automaton is used as a States-based Generalized
/// Büchi Automaton. /// Büchi Automaton.
/// ///
/// The construction is done on-the-fly, by the /// The construction is done on-the-fly, by the
/// \c tgba_complement_succ_iterator class. /// \c tgba_kv_complement_succ_iterator class.
/// \see tgba_complement_succ_iteratora /// \see tgba_kv_complement_succ_iterator
class tgba_complement : public tgba class tgba_kv_complement : public tgba
{ {
public: public:
tgba_complement(const tgba* a); tgba_kv_complement(const tgba* a);
virtual ~tgba_complement(); virtual ~tgba_kv_complement();
// tgba interface // tgba interface
virtual state* get_init_state() const; virtual state* get_init_state() const;
@ -111,9 +111,9 @@ namespace spot
bdd the_acceptance_cond_; bdd the_acceptance_cond_;
unsigned nb_states_; unsigned nb_states_;
acc_list_t acc_list_; acc_list_t acc_list_;
}; // end class tgba_complement. }; // end class tgba_kv_complement.
} // end namespace spot. } // end namespace spot.
#endif // !SPOT_TGBA_TGBACOMPLEMENT_HH #endif // !SPOT_TGBA_TGBAKVCOMPLEMENT_HH

20
src/tgbatest/complementation.cc
View file

@ -1,4 +1,4 @@
// Copyright (C) 2008, 2009 Laboratoire de Recherche et Développement // Copyright (C) 2008, 2009, 2010 Laboratoire de Recherche et Développement
// de l'Epita (LRDE). // de l'Epita (LRDE).
// //
// This file is part of Spot, a model checking library. // This file is part of Spot, a model checking library.
@ -34,14 +34,14 @@
#include "tgba/tgbatba.hh" #include "tgba/tgbatba.hh"
#include "tgba/tgbasafracomplement.hh" #include "tgba/tgbasafracomplement.hh"
#include "tgba/tgbacomplement.hh" #include "tgba/tgbakvcomplement.hh"
void usage(const char* prog) void usage(const char* prog)
{ {
std::cout << "usage: " << prog << " [options]" << std::endl; std::cout << "usage: " << prog << " [options]" << std::endl;
std::cout << "with options" << std::endl std::cout << "with options" << std::endl
<< "-S Use safra complementation" << "-S Use Safra's complementation "
<< std::endl << "instead of Kupferman&Vardi's" << std::endl
<< "-s buchi_automaton display the safra automaton" << "-s buchi_automaton display the safra automaton"
<< std::endl << std::endl
<< "-a buchi_automaton display the complemented automaton" << "-a buchi_automaton display the complemented automaton"
@ -131,7 +131,7 @@ int main(int argc, char* argv[])
if (safra) if (safra)
complement = new spot::tgba_safra_complement(a); complement = new spot::tgba_safra_complement(a);
else else
complement = new spot::tgba_complement(a); complement = new spot::tgba_kv_complement(a);
if (print_automaton) if (print_automaton)
spot::dotty_reachable(std::cout, complement); spot::dotty_reachable(std::cout, complement);
@ -162,7 +162,7 @@ int main(int argc, char* argv[])
if (safra) if (safra)
complement = new spot::tgba_safra_complement(a); complement = new spot::tgba_safra_complement(a);
else else
complement = new spot::tgba_complement(a); complement = new spot::tgba_kv_complement(a);
spot::dotty_reachable(std::cout, complement); spot::dotty_reachable(std::cout, complement);
f1->destroy(); f1->destroy();
@ -219,8 +219,8 @@ int main(int argc, char* argv[])
<< safra_complement->number_of_acceptance_conditions() << safra_complement->number_of_acceptance_conditions()
<< std::endl; << std::endl;
spot::tgba_complement* complement = spot::tgba_kv_complement* complement =
new spot::tgba_complement(a); new spot::tgba_kv_complement(a);
b_size = spot::stats_reachable(complement); b_size = spot::stats_reachable(complement);
std::cout << "GBA Complement: " std::cout << "GBA Complement: "
@ -271,8 +271,8 @@ int main(int argc, char* argv[])
} }
else else
{ {
nAf = new spot::tgba_complement(Af); nAf = new spot::tgba_kv_complement(Af);
nAnf = new spot::tgba_complement(Anf); nAnf = new spot::tgba_kv_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);