Add a new type of automata: State-labeled Alternating Büchi
Automata (SABA). * src/saba/saba.hh, src/saba/saba.cc, src/saba/sabastate.hh, src/saba/sabasucciter.hh: New. Interface for SABA (State-labeled Alternating Büchi Automata). * src/saba/explicitstateconjunction.cc, src/saba/explicitstateconjunction.hh: New. Default implementation for a conjunction of states. * src/saba/Makefile.am: New. * src/Makefile.am, configure.ac: Adjust. * src/sabaalgos/sabareachiter.cc, src/sabaalgos/sabareachiter.hh: New. Iterate over all reachable states of a spot::saba. * src/sabaalgos/sabadotty.cc, src/sabaalgos/sabadotty.hh: New. Print reachable states in dot format. * src/sabaalgos/Makefile.am: New.
This commit is contained in:
Guillaume Sadegh
parent
f00aa49dc3
commit
7cb6ff331d
15 changed files with 1331 additions and 5 deletions
30
src/sabaalgos/Makefile.am
Normal file
30
src/sabaalgos/Makefile.am
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
## Copyright (C) 2009 Laboratoire d'Informatique de Paris 6 (LIP6),
|
||||
## département Systèmes Répartis Coopératifs (SRC), Université Pierre
|
||||
## et Marie Curie.
|
||||
##
|
||||
## This file is part of Spot, a model checking library.
|
||||
##
|
||||
## Spot is free software; you can redistribute it and/or modify it
|
||||
## under the terms of the GNU General Public License as published by
|
||||
## the Free Software Foundation; either version 2 of the License, or
|
||||
## (at your option) any later version.
|
||||
##
|
||||
## Spot is distributed in the hope that it will be useful, but WITHOUT
|
||||
## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
## or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
|
||||
## License for more details.
|
||||
##
|
||||
## You should have received a copy of the GNU General Public License
|
||||
## along with Spot; see the file COPYING. If not, write to the Free
|
||||
## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||||
## 02111-1307, USA.
|
||||
|
||||
AM_CPPFLAGS = -I$(srcdir)/.. $(BUDDY_CPPFLAGS)
|
||||
AM_CXXFLAGS = $(WARNING_CXXFLAGS)
|
||||
|
||||
sabaalgosdir = $(pkgincludedir)/sabaalgos
|
||||
|
||||
sabaalgos_HEADERS = sabadotty.hh sabareachiter.hh
|
||||
|
||||
noinst_LTLIBRARIES = libsabaalgos.la
|
||||
libsabaalgos_la_SOURCES = sabadotty.cc sabareachiter.cc
|
||||
111
src/sabaalgos/sabadotty.cc
Normal file
111
src/sabaalgos/sabadotty.cc
Normal file
|
|
@ -0,0 +1,111 @@
|
|||
// Copyright (C) 2009 Laboratoire d'Informatique de Paris 6 (LIP6),
|
||||
// département Systèmes Répartis Coopératifs (SRC), Université Pierre
|
||||
// et Marie Curie.
|
||||
//
|
||||
// This file is part of Spot, a model checking library.
|
||||
//
|
||||
// Spot is free software; you can redistribute it and/or modify it
|
||||
// under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation; either version 2 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// Spot is distributed in the hope that it will be useful, but WITHOUT
|
||||
// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
|
||||
// License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Spot; see the file COPYING. If not, write to the Free
|
||||
// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||||
// 02111-1307, USA.
|
||||
|
||||
#include <ostream>
|
||||
#include "saba/saba.hh"
|
||||
#include "sabadotty.hh"
|
||||
#include "tgba/bddprint.hh"
|
||||
#include "sabareachiter.hh"
|
||||
#include "misc/escape.hh"
|
||||
|
||||
namespace spot
|
||||
{
|
||||
namespace
|
||||
{
|
||||
class saba_dotty_bfs : public saba_reachable_iterator_breadth_first
|
||||
{
|
||||
public:
|
||||
saba_dotty_bfs(std::ostream& os, const saba* a)
|
||||
: saba_reachable_iterator_breadth_first(a), os_(os)
|
||||
{
|
||||
}
|
||||
|
||||
void
|
||||
start()
|
||||
{
|
||||
os_ << "digraph G {" << std::endl;
|
||||
os_ << " 0 [label=\"\", style=invis, height=0]" << std::endl;
|
||||
os_ << " 0 -> 1;" << std::endl;
|
||||
}
|
||||
|
||||
void
|
||||
end()
|
||||
{
|
||||
os_ << "}" << std::endl;
|
||||
}
|
||||
|
||||
void
|
||||
process_state(const saba_state* s, int n)
|
||||
{
|
||||
std::string label =
|
||||
escape_str(automata_->format_state(s))
|
||||
+ "\\n"
|
||||
+ bdd_format_accset(automata_->get_dict(),
|
||||
s->acceptance_conditions());
|
||||
os_ << " " << n << " "
|
||||
<< "[label=\"" << label << "\"];"
|
||||
<< std::endl;
|
||||
}
|
||||
|
||||
void
|
||||
process_state_conjunction(const saba_state*, int in,
|
||||
const saba_state_conjunction*,
|
||||
int sc_id,
|
||||
const saba_succ_iterator* si)
|
||||
{
|
||||
os_ << " s" << in << "sc" << sc_id
|
||||
<< " [label=\"\", style=invis, height=0];" << std::endl;
|
||||
|
||||
std::string label =
|
||||
bdd_format_formula(automata_->get_dict(),
|
||||
si->current_condition());
|
||||
|
||||
os_ << " " << in << " -> s" << in << "sc" << sc_id
|
||||
<< " [label=\"" << label << "\", arrowhead=\"none\"];"
|
||||
<< std::endl;
|
||||
}
|
||||
|
||||
void
|
||||
process_link(const saba_state*, int in,
|
||||
const saba_state*, int out,
|
||||
const saba_state_conjunction*,
|
||||
int sc_id,
|
||||
const saba_succ_iterator*)
|
||||
{
|
||||
os_ << " s" << in << "sc" << sc_id << " -> " << out
|
||||
<< " [label=\"\"];"
|
||||
<< std::endl;
|
||||
}
|
||||
|
||||
private:
|
||||
std::ostream& os_;
|
||||
};
|
||||
}
|
||||
|
||||
std::ostream&
|
||||
saba_dotty_reachable(std::ostream& os, const saba* g)
|
||||
{
|
||||
saba_dotty_bfs d(os, g);
|
||||
d.run();
|
||||
return os;
|
||||
}
|
||||
|
||||
}
|
||||
38
src/sabaalgos/sabadotty.hh
Normal file
38
src/sabaalgos/sabadotty.hh
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
// Copyright (C) 2009 Laboratoire d'Informatique de Paris 6 (LIP6),
|
||||
// département Systèmes Répartis Coopératifs (SRC), Université Pierre
|
||||
// et Marie Curie.
|
||||
//
|
||||
// This file is part of Spot, a model checking library.
|
||||
//
|
||||
// Spot is free software; you can redistribute it and/or modify it
|
||||
// under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation; either version 2 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// Spot is distributed in the hope that it will be useful, but WITHOUT
|
||||
// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
|
||||
// License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Spot; see the file COPYING. If not, write to the Free
|
||||
// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||||
// 02111-1307, USA.
|
||||
|
||||
#ifndef SPOT_SABAALGOS_SABADOTTY_HH
|
||||
# define SPOT_SABAALGOS_SABADOTTY_HH
|
||||
|
||||
#include <iosfwd>
|
||||
|
||||
namespace spot
|
||||
{
|
||||
class saba;
|
||||
|
||||
/// \brief Print reachable states in dot format.
|
||||
/// \ingroup saba_io
|
||||
std::ostream&
|
||||
saba_dotty_reachable(std::ostream& os,
|
||||
const saba* g);
|
||||
}
|
||||
|
||||
#endif // SPOT_SABAALGOS_SABADOTTY_HH
|
||||
189
src/sabaalgos/sabareachiter.cc
Normal file
189
src/sabaalgos/sabareachiter.cc
Normal file
|
|
@ -0,0 +1,189 @@
|
|||
// Copyright (C) 2009 Laboratoire d'Informatique de Paris 6 (LIP6),
|
||||
// département Systèmes Répartis Coopératifs (SRC), Université Pierre
|
||||
// et Marie Curie.
|
||||
//
|
||||
// This file is part of Spot, a model checking library.
|
||||
//
|
||||
// Spot is free software; you can redistribute it and/or modify it
|
||||
// under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation; either version 2 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// Spot is distributed in the hope that it will be useful, but WITHOUT
|
||||
// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
|
||||
// License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Spot; see the file COPYING. If not, write to the Free
|
||||
// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||||
// 02111-1307, USA.
|
||||
|
||||
#include <cassert>
|
||||
#include "sabareachiter.hh"
|
||||
|
||||
namespace spot
|
||||
{
|
||||
// saba_reachable_iterator
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
||||
saba_reachable_iterator::saba_reachable_iterator(const saba* a)
|
||||
: automata_(a)
|
||||
{
|
||||
}
|
||||
|
||||
saba_reachable_iterator::~saba_reachable_iterator()
|
||||
{
|
||||
seen_map::const_iterator s = seen.begin();
|
||||
while (s != seen.end())
|
||||
{
|
||||
// Advance the iterator before deleting the "key" pointer.
|
||||
const saba_state* ptr = s->first;
|
||||
++s;
|
||||
delete ptr;
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
saba_reachable_iterator::run()
|
||||
{
|
||||
int n = 0;
|
||||
int conjn = 0;
|
||||
|
||||
start();
|
||||
saba_state* i = automata_->get_init_state();
|
||||
if (want_state(i))
|
||||
add_state(i);
|
||||
seen[i] = ++n;
|
||||
const saba_state* t;
|
||||
while ((t = next_state()))
|
||||
{
|
||||
assert(seen.find(t) != seen.end());
|
||||
int tn = seen[t];
|
||||
saba_succ_iterator* si = automata_->succ_iter(t);
|
||||
process_state(t, tn);
|
||||
for (si->first(); !si->done(); si->next())
|
||||
{
|
||||
saba_state_conjunction* conj = si->current_conjunction();
|
||||
++conjn;
|
||||
process_state_conjunction(t, tn, conj, conjn, si);
|
||||
|
||||
for (conj->first(); !conj->done(); conj->next())
|
||||
{
|
||||
const saba_state* current = conj->current_state();
|
||||
seen_map::const_iterator s = seen.find(current);
|
||||
bool ws = want_state(current);
|
||||
|
||||
if (s == seen.end())
|
||||
{
|
||||
seen[current] = ++n;
|
||||
if (ws)
|
||||
{
|
||||
add_state(current);
|
||||
process_link(t, tn, current, n, conj, conjn, si);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (ws)
|
||||
process_link(t, tn, s->first, s->second, conj, conjn, si);
|
||||
delete current;
|
||||
}
|
||||
}
|
||||
delete conj;
|
||||
}
|
||||
delete si;
|
||||
}
|
||||
end();
|
||||
}
|
||||
|
||||
bool
|
||||
saba_reachable_iterator::want_state(const saba_state*) const
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
void
|
||||
saba_reachable_iterator::start()
|
||||
{
|
||||
}
|
||||
|
||||
void
|
||||
saba_reachable_iterator::end()
|
||||
{
|
||||
}
|
||||
|
||||
void
|
||||
saba_reachable_iterator::process_state(const saba_state*, int)
|
||||
{
|
||||
}
|
||||
|
||||
void
|
||||
saba_reachable_iterator::
|
||||
process_state_conjunction(const saba_state*, int,
|
||||
const saba_state_conjunction*,
|
||||
int,
|
||||
const saba_succ_iterator*)
|
||||
{
|
||||
}
|
||||
|
||||
void
|
||||
saba_reachable_iterator::process_link(const saba_state*, int,
|
||||
const saba_state*, int,
|
||||
const saba_state_conjunction*,
|
||||
int,
|
||||
const saba_succ_iterator*)
|
||||
{
|
||||
}
|
||||
|
||||
// saba_reachable_iterator_depth_first
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
||||
saba_reachable_iterator_depth_first::
|
||||
saba_reachable_iterator_depth_first(const saba* a)
|
||||
: saba_reachable_iterator(a)
|
||||
{
|
||||
}
|
||||
|
||||
void
|
||||
saba_reachable_iterator_depth_first::add_state(const saba_state* s)
|
||||
{
|
||||
todo.push(s);
|
||||
}
|
||||
|
||||
const saba_state*
|
||||
saba_reachable_iterator_depth_first::next_state()
|
||||
{
|
||||
if (todo.empty())
|
||||
return 0;
|
||||
const saba_state* s = todo.top();
|
||||
todo.pop();
|
||||
return s;
|
||||
}
|
||||
|
||||
// saba_reachable_iterator_breadth_first
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
||||
saba_reachable_iterator_breadth_first::
|
||||
saba_reachable_iterator_breadth_first(const saba* a)
|
||||
: saba_reachable_iterator(a)
|
||||
{
|
||||
}
|
||||
|
||||
void
|
||||
saba_reachable_iterator_breadth_first::add_state(const saba_state* s)
|
||||
{
|
||||
todo.push_back(s);
|
||||
}
|
||||
|
||||
const saba_state*
|
||||
saba_reachable_iterator_breadth_first::next_state()
|
||||
{
|
||||
if (todo.empty())
|
||||
return 0;
|
||||
const saba_state* s = todo.front();
|
||||
todo.pop_front();
|
||||
return s;
|
||||
}
|
||||
|
||||
}
|
||||
150
src/sabaalgos/sabareachiter.hh
Normal file
150
src/sabaalgos/sabareachiter.hh
Normal file
|
|
@ -0,0 +1,150 @@
|
|||
// Copyright (C) 2009 Laboratoire d'Informatique de Paris 6
|
||||
// (LIP6), département Systèmes Répartis Coopératifs (SRC), Université
|
||||
// Pierre et Marie Curie.
|
||||
//
|
||||
// This file is part of Spot, a model checking library.
|
||||
//
|
||||
// Spot is free software; you can redistribute it and/or modify it
|
||||
// under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation; either version 2 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// Spot is distributed in the hope that it will be useful, but WITHOUT
|
||||
// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
|
||||
// License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Spot; see the file COPYING. If not, write to the Free
|
||||
// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||||
// 02111-1307, USA.
|
||||
|
||||
#ifndef SPOT_SABAALGOS_SABAREACHITER_HH
|
||||
# define SPOT_SABAALGOS_SABAREACHITER_HH
|
||||
|
||||
#include "misc/hash.hh"
|
||||
#include "saba/saba.hh"
|
||||
#include <stack>
|
||||
#include <deque>
|
||||
|
||||
namespace spot
|
||||
{
|
||||
/// \brief Iterate over all reachable states of a spot::saba.
|
||||
/// \ingroup saba_generic
|
||||
class saba_reachable_iterator
|
||||
{
|
||||
public:
|
||||
saba_reachable_iterator(const saba* a);
|
||||
virtual ~saba_reachable_iterator();
|
||||
|
||||
/// \brief Iterate over all reachable states of a spot::saba.
|
||||
///
|
||||
/// This is a template method that will call add_state(), next_state(),
|
||||
/// start(), end(), process_state(), process_state_conjunction() and
|
||||
/// process_link(), while it iterates over states.
|
||||
void run();
|
||||
|
||||
/// \name Todo list management.
|
||||
///
|
||||
/// spot::saba_reachable_iterator_depth_first and
|
||||
/// spot::saba_reachable_iterator_breadth_first offer two precanned
|
||||
/// implementations for these functions.
|
||||
/// \{
|
||||
/// \brief Called by run() to register newly discovered states.
|
||||
virtual void add_state(const saba_state* s) = 0;
|
||||
/// \brief Called by run() to obtain the next state to process.
|
||||
virtual const saba_state* next_state() = 0;
|
||||
/// \}
|
||||
|
||||
/// Called by add_state or next_states implementations to filter
|
||||
/// states. Default implementation always return true.
|
||||
virtual bool want_state(const saba_state* s) const;
|
||||
|
||||
/// Called by run() before starting its iteration.
|
||||
virtual void start();
|
||||
/// Called by run() once all states have been explored.
|
||||
virtual void end();
|
||||
|
||||
/// Called by run() to process a state.
|
||||
///
|
||||
/// \param s The current state.
|
||||
/// \param n A unique number assigned to \a s.
|
||||
virtual void process_state(const saba_state* s, int n);
|
||||
|
||||
/// Called by run() to process a conjunction of states.
|
||||
///
|
||||
/// \param in_s The current state.
|
||||
/// \param in An unique number assigned to \a in_s.
|
||||
/// \param sc The spot::saba_state_conjunction positionned on the current
|
||||
/// conjunction.
|
||||
/// \param sc_id An unique number for the this transition assigned to \a sc.
|
||||
/// \param si The spot::saba_succ_iterator positionned on the current
|
||||
/// transition.
|
||||
virtual void
|
||||
process_state_conjunction(const saba_state* in_s, int in,
|
||||
const saba_state_conjunction* sc,
|
||||
int sc_id,
|
||||
const saba_succ_iterator* si);
|
||||
/// Called by run() to process a transition.
|
||||
///
|
||||
/// \param in_s The source state
|
||||
/// \param in The source state number.
|
||||
/// \param out_s The destination state
|
||||
/// \param out The destination state number.
|
||||
/// \param sc The spot::saba_state_conjunction positionned on the current
|
||||
/// conjunction.
|
||||
/// \param sc_id An unique number for the this transition assigned to \a sc.
|
||||
///
|
||||
/// The in_s and out_s states are owned by the
|
||||
/// spot::saba_reachable_iterator instance and destroyed when the
|
||||
/// instance is destroyed.
|
||||
virtual void
|
||||
process_link(const saba_state* in_s, int in,
|
||||
const saba_state* out_s, int out,
|
||||
const saba_state_conjunction* sc,
|
||||
int sc_id,
|
||||
const saba_succ_iterator* si);
|
||||
|
||||
protected:
|
||||
const saba* automata_; ///< The spot::saba to explore.
|
||||
|
||||
typedef Sgi::hash_map<const saba_state*, int,
|
||||
saba_state_ptr_hash, saba_state_ptr_equal> seen_map;
|
||||
seen_map seen; ///< States already seen.
|
||||
};
|
||||
|
||||
/// \brief An implementation of spot::saba_reachable_iterator that browses
|
||||
/// states depth first.
|
||||
/// \ingroup saba_generic
|
||||
class saba_reachable_iterator_depth_first : public saba_reachable_iterator
|
||||
{
|
||||
public:
|
||||
saba_reachable_iterator_depth_first(const saba* a);
|
||||
|
||||
virtual void add_state(const saba_state* s);
|
||||
virtual const saba_state* next_state();
|
||||
|
||||
protected:
|
||||
std::stack<const saba_state*> todo; ///< A stack of states yet to explore.
|
||||
};
|
||||
|
||||
/// \brief An implementation of spot::saba_reachable_iterator that browses
|
||||
/// states breadth first.
|
||||
/// \ingroup saba_generic
|
||||
class saba_reachable_iterator_breadth_first : public saba_reachable_iterator
|
||||
{
|
||||
public:
|
||||
saba_reachable_iterator_breadth_first(const saba* a);
|
||||
|
||||
virtual void add_state(const saba_state* s);
|
||||
virtual const saba_state* next_state();
|
||||
|
||||
protected:
|
||||
std::deque<const saba_state*> todo; ///< A queue of states yet to explore.
|
||||
};
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
#endif // SPOT_SABAALGOS_SABAREACHITER_HH
|
||||
Loading…
Add table
Add a link
Reference in a new issue