From 03704d635ecd0164a61fc89d81eb759d09f2c710 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Tue, 30 Dec 2003 16:08:18 +0000 Subject: [PATCH] * iface/gspn/ltleesrg.cc: New file. * iface/gspn/Makefile.am (check_PROGRAMS): Add ltleesrg. (ltleesrg_LDADD, ltleesrg_SOURCES): New variables. --- ChangeLog | 4 ++ iface/gspn/Makefile.am | 6 ++- iface/gspn/ltleesrg.cc | 95 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 104 insertions(+), 1 deletion(-) create mode 100644 iface/gspn/ltleesrg.cc diff --git a/ChangeLog b/ChangeLog index c8f4ce2a9..63c0c2cba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2003-12-30 Alexandre Duret-Lutz + * iface/gspn/ltleesrg.cc: New file. + * iface/gspn/Makefile.am (check_PROGRAMS): Add ltleesrg. + (ltleesrg_LDADD, ltleesrg_SOURCES): New variables. + * src/ltltest/defs.in (run): Reun valgrind with --leak-check=yes. * src/ltlparse/ltlparse.yy: Add `%destructor's. diff --git a/iface/gspn/Makefile.am b/iface/gspn/Makefile.am index f9b781678..9280bce6f 100644 --- a/iface/gspn/Makefile.am +++ b/iface/gspn/Makefile.am @@ -46,7 +46,8 @@ check_PROGRAMS = \ dottygspn-srg \ dottygspn-eesrg \ ltlgspn-rg \ - ltlgspn-srg + ltlgspn-srg \ + ltleesrg dottygspn_rg_SOURCES = dottygspn.cc dottygspn_rg_LDADD = libspotgspn.la $(LIBGSPNRG_LDFLAGS) @@ -63,6 +64,9 @@ ltlgspn_rg_LDADD = libspotgspn.la $(LIBGSPNRG_LDFLAGS) ltlgspn_srg_SOURCES = ltlgspn.cc ltlgspn_srg_LDADD = libspotgspn.la $(LIBGSPNSRG_LDFLAGS) +ltleesrg_SOURCES = ltleesrg.cc +ltleesrg_LDADD = libspotgspneesrg.la $(LIBGSPNESRG_LDFLAGS) + EXTRA_DIST = \ examples/DCSwave/DCSWave.def \ examples/DCSwave/DCSWave.net \ diff --git a/iface/gspn/ltleesrg.cc b/iface/gspn/ltleesrg.cc new file mode 100644 index 000000000..734aafbeb --- /dev/null +++ b/iface/gspn/ltleesrg.cc @@ -0,0 +1,95 @@ +// Copyright (C) 2003 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 "eesrg.hh" +#include "tgbaalgos/dotty.hh" +#include "tgba/tgbaexplicit.hh" +#include "tgbaparse/public.hh" +#include "tgbaalgos/ltl2tgba_fm.hh" +#include "tgbaalgos/emptinesscheck.hh" +#include "ltlparse/public.hh" +#include "ltlvisit/destroy.hh" +#include "tgba/tgbaproduct.hh" + +int +main(int argc, char **argv) + try + { + spot::gspn_environment env; + + if (argc <= 4) + { + std::cerr << "usage: " << argv[0] + << " model ltlformula automata props..." + << std::endl; + exit(1); + } + + while (argc > 4) + env.declare(argv[--argc]); + + spot::ltl::parse_error_list pel; + spot::ltl::formula* f = spot::ltl::parse(argv[2], pel, env); + if (spot::ltl::format_parse_errors(std::cerr, argv[2], pel)) + exit(2); + + spot::gspn_eesrg_interface gspn(2, argv); + spot::bdd_dict* dict = new spot::bdd_dict(); + + spot::tgba_parse_error_list pel1; + spot::tgba_explicit* control = spot::tgba_parse(argv[3], pel1, + dict, env); + if (spot::format_tgba_parse_errors(std::cerr, pel1)) + return 2; + + spot::tgba* a_f = spot::ltl_to_tgba_fm(f, dict); + spot::ltl::destroy(f); + + spot::tgba_product* prod = new spot::tgba_product(control, a_f); + + + { + spot::tgba_gspn_eesrg a(dict, env, prod); + + spot::emptiness_check ec(prod); + bool res = ec.check(); + if (!res) + { + ec.counter_example(); + ec.print_result(std::cout, prod); + exit(1); + } + else + { + std::cout << "empty" << std::endl; + } + } + + delete prod; + delete a_f; + delete control; + delete dict; + } + catch (spot::gspn_exeption e) + { + std::cerr << e << std::endl; + throw; + }