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

Teach the DVE2 interface about atomic propositions such as "a <=

Browse source 
10" or "b != 3".  This only work for integer variables presently.

* iface/dve2/dve2.hh (load_dve2): Take an atomic_prop_set
argument to indicate the AP to observe.
* iface/dve2/dve2.cc (convert_aps): New function.  Parse the
atomic propositions in format them in a prop_set structure that
will allow fast generation of the state condition.
(load_dve2): Call convert_aps, and pass the resulting prop_set
structure to the kripke object.
(dve2_kripke::dve2_kripke): Store the prop_set structure.
(dve2_kripke::~dve2_kripke): Release the prop_set, and unregister
the bdd_variable associated to it.
(compute_state_condition): New method that uses the prop_set.
(succ_iter, state_condition): Call compute_state_condition().
* iface/dve2/dve2check.cc: Adjust the call to load_dve2 to
pass it atomic propositions read from the command line.
This commit is contained in:
Alexandre Duret-Lutz 2011-03-05 17:56:48 +01:00
parent 5a76a7bb05
commit 8136bd412d
4 changed files with 278 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

30
iface/dve2/dve2check.cc
View file

@ -20,12 +20,16 @@
#include "dve2.hh"
#include "tgbaalgos/dotty.hh"
#include "ltlenv/declenv.hh"
#include "ltlenv/defaultenv.hh"
#include "ltlast/allnodes.hh"
int
main(int argc, char **argv)
{
spot::ltl::declarative_environment env;
spot::ltl::default_environment& env =
spot::ltl::default_environment::instance();
spot::ltl::atomic_prop_set ap;
if (argc <= 1)
{
@ -35,12 +39,18 @@ main(int argc, char **argv)
while (argc > 2)
{
env.declare(argv[argc - 1]);
ap.insert(static_cast<spot::ltl::atomic_prop*>
(env.require(argv[argc - 1])));
--argc;
}
spot::bdd_dict* dict = new spot::bdd_dict();
spot::kripke* a = spot::load_dve2(argv[1], dict, true);
spot::kripke* a = spot::load_dve2(argv[1], dict, &ap, true);
for (spot::ltl::atomic_prop_set::const_iterator it = ap.begin();
it != ap.end(); ++it)
(*it)->destroy();
ap.clear();
if (!a)
{
@ -51,5 +61,17 @@ main(int argc, char **argv)
spot::dotty_reachable(std::cout, a);
delete a;
spot::ltl::atomic_prop::dump_instances(std::cerr);
spot::ltl::unop::dump_instances(std::cerr);
spot::ltl::binop::dump_instances(std::cerr);
spot::ltl::multop::dump_instances(std::cerr);
spot::ltl::automatop::dump_instances(std::cerr);
assert(spot::ltl::atomic_prop::instance_count() == 0);
assert(spot::ltl::unop::instance_count() == 0);
assert(spot::ltl::binop::instance_count() == 0);
assert(spot::ltl::multop::instance_count() == 0);
assert(spot::ltl::automatop::instance_count() == 0);
delete dict;
}