Flatten the formula ltl::formula hiearchy into a single ltl::vnode that has an enumerator to distinguish the types of node, and a common interface to access children, update reference counts, etc. The ltl::formula class is now a thin wrapper around an ltl::vnode pointer to keep track of reference counts automatically. Visitor are not used anymore; we now have map() and traversor() methods that are more concise. This basically fixes #43, but should be followed by some fine tuning that should now be localized to the formula.hh and formula.cc files. Some statistics about this patch. I started working on it on Sep 9, had a first compiling version two weeks later on Sep 22, and it then took 5 days to fixes the ~70 distincts bugs that were introduced during the conversion. About 13200 lines were modified, and one third of those were removed. * src/ltlast/formula.cc, src/ltlast/formula.hh: Complete rewrite, including what was in separate nearby files. * src/ltlast/allnodes.hh, src/ltlast/atomic_prop.cc, src/ltlast/atomic_prop.hh, src/ltlast/binop.cc, src/ltlast/binop.hh, src/ltlast/bunop.cc, src/ltlast/bunop.hh, src/ltlast/constant.cc, src/ltlast/constant.hh, src/ltlast/multop.cc, src/ltlast/multop.hh, src/ltlast/unop.cc, src/ltlast/unop.hh, src/ltlvisit/dump.cc, src/ltlvisit/dump.hh, src/ltlast/predecl.hh: Delete these files. Their feature have been merged in formula.hh and formula.cc. * src/ltlast/visitor.hh, src/ltlvisit/clone.cc, src/ltlvisit/clone.hh, src/ltlvisit/dump.hh, src/ltlvisit/postfix.cc, src/ltlvisit/postfix.hh: Delete these files, as we do not use visitors anymore. * bench/stutter/stutter_invariance_formulas.cc, bench/stutter/stutter_invariance_randomgraph.cc, doc/org/tut01.org, doc/org/tut02.org, doc/org/tut10.org, doc/org/tut22.org, iface/ltsmin/ltsmin.cc, iface/ltsmin/ltsmin.hh, iface/ltsmin/modelcheck.cc, src/bin/autfilt.cc, src/bin/common_aoutput.cc, src/bin/common_aoutput.hh, src/bin/common_finput.cc, src/bin/common_finput.hh, src/bin/common_output.cc, src/bin/common_output.hh, src/bin/common_trans.cc, src/bin/common_trans.hh, src/bin/dstar2tgba.cc, src/bin/genltl.cc, src/bin/ltl2tgba.cc, src/bin/ltl2tgta.cc, src/bin/ltlcross.cc, src/bin/ltldo.cc, src/bin/ltlfilt.cc, src/bin/ltlgrind.cc, src/bin/randaut.cc, src/bin/randltl.cc, src/kripke/kripkeexplicit.cc, src/kripke/kripkeexplicit.hh, src/kripkeparse/kripkeparse.yy, src/ltlast/Makefile.am, src/ltlenv/declenv.cc, src/ltlenv/declenv.hh, src/ltlenv/defaultenv.cc, src/ltlenv/defaultenv.hh, src/ltlenv/environment.hh, src/ltlparse/ltlparse.yy, src/ltlparse/public.hh, src/ltlvisit/Makefile.am, src/ltlvisit/apcollect.cc, src/ltlvisit/apcollect.hh, src/ltlvisit/contain.cc, src/ltlvisit/contain.hh, src/ltlvisit/dot.cc, src/ltlvisit/dot.hh, src/ltlvisit/exclusive.cc, src/ltlvisit/exclusive.hh, src/ltlvisit/length.cc, src/ltlvisit/length.hh, src/ltlvisit/mark.cc, src/ltlvisit/mark.hh, src/ltlvisit/mutation.cc, src/ltlvisit/mutation.hh, src/ltlvisit/nenoform.cc, src/ltlvisit/nenoform.hh, src/ltlvisit/print.cc, src/ltlvisit/print.hh, src/ltlvisit/randomltl.cc, src/ltlvisit/randomltl.hh, src/ltlvisit/relabel.cc, src/ltlvisit/relabel.hh, src/ltlvisit/remove_x.cc, src/ltlvisit/remove_x.hh, src/ltlvisit/simpfg.cc, src/ltlvisit/simpfg.hh, src/ltlvisit/simplify.cc, src/ltlvisit/simplify.hh, src/ltlvisit/snf.cc, src/ltlvisit/snf.hh, src/ltlvisit/unabbrev.cc, src/ltlvisit/unabbrev.hh, src/parseaut/parseaut.yy, src/ta/taexplicit.cc, src/ta/tgtaexplicit.cc, src/taalgos/minimize.cc, src/taalgos/tgba2ta.cc, src/tests/bare.test, src/tests/checkpsl.cc, src/tests/checkta.cc, src/tests/complementation.cc, src/tests/consterm.cc, src/tests/emptchk.cc, src/tests/equalsf.cc, src/tests/ikwiad.cc, src/tests/isop.test, src/tests/kind.cc, src/tests/length.cc, src/tests/ltldo.test, src/tests/ltlfilt.test, src/tests/ltlgrind.test, src/tests/ltlprod.cc, src/tests/ltlrel.cc, src/tests/parse_print_test.cc, src/tests/parseaut.test, src/tests/parseerr.test, src/tests/randtgba.cc, src/tests/readltl.cc, src/tests/reduc.cc, src/tests/syntimpl.cc, src/tests/taatgba.cc, src/tests/tostring.cc, src/tests/twagraph.cc, src/tests/utf8.test, src/twa/acc.cc, src/twa/bdddict.cc, src/twa/bdddict.hh, src/twa/bddprint.cc, src/twa/formula2bdd.cc, src/twa/formula2bdd.hh, src/twa/taatgba.cc, src/twa/taatgba.hh, src/twa/twa.cc, src/twa/twa.hh src/twa/twagraph.cc, src/twa/twagraph.hh, src/twa/twasafracomplement.cc, src/twaalgos/compsusp.cc, src/twaalgos/compsusp.hh, src/twaalgos/dtgbasat.cc, src/twaalgos/hoa.cc, src/twaalgos/lbtt.cc, src/twaalgos/ltl2taa.cc, src/twaalgos/ltl2taa.hh, src/twaalgos/ltl2tgba_fm.cc, src/twaalgos/ltl2tgba_fm.hh, src/twaalgos/minimize.cc, src/twaalgos/minimize.hh, src/twaalgos/neverclaim.cc, src/twaalgos/postproc.cc, src/twaalgos/postproc.hh, src/twaalgos/powerset.cc, src/twaalgos/powerset.hh, src/twaalgos/randomgraph.cc, src/twaalgos/remprop.cc, src/twaalgos/remprop.hh, src/twaalgos/stats.cc, src/twaalgos/stats.hh, src/twaalgos/stutter.cc, src/twaalgos/stutter.hh, src/twaalgos/translate.cc, src/twaalgos/translate.hh, wrap/python/ajax/spotcgi.in, wrap/python/spot.py, wrap/python/spot_impl.i, wrap/python/Makefile.am, wrap/python/tests/automata-io.ipynb, wrap/python/tests/formulas.ipynb, wrap/python/tests/ltl2tgba.py, wrap/python/tests/ltlparse.py, wrap/python/tests/ltlsimple.py, wrap/python/tests/randltl.ipynb: Adjust to use the new interface. * src/sanity/style.test: Accept more C++11 patterns. * NEWS: Mention the change.
371 lines
8.7 KiB
C++
371 lines
8.7 KiB
C++
// -*- coding: utf-8 -*-
|
|
// Copyright (C) 2011, 2012, 2013, 2014, 2015 Laboratoire de Recherche
|
|
// et Developpement de l'Epita (LRDE)
|
|
//
|
|
// 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 3 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 this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
#include "ltsmin.hh"
|
|
#include "twaalgos/dot.hh"
|
|
#include "ltlenv/defaultenv.hh"
|
|
#include "ltlparse/public.hh"
|
|
#include "twaalgos/translate.hh"
|
|
#include "twaalgos/emptiness.hh"
|
|
#include "twaalgos/reducerun.hh"
|
|
#include "twaalgos/postproc.hh"
|
|
#include "twa/twaproduct.hh"
|
|
#include "misc/timer.hh"
|
|
#include "misc/memusage.hh"
|
|
#include <cstring>
|
|
#include "kripke/kripkeexplicit.hh"
|
|
#include "kripke/kripkeprint.hh"
|
|
|
|
static void
|
|
syntax(char* prog)
|
|
{
|
|
// Display the supplied name unless it appears to be a libtool wrapper.
|
|
char* slash = strrchr(prog, '/');
|
|
if (slash && (strncmp(slash + 1, "lt-", 3) == 0))
|
|
prog = slash + 4;
|
|
|
|
std::cerr << "usage: " << prog << " [options] model formula\n\
|
|
\n\
|
|
Options:\n\
|
|
-dDEAD use DEAD as property for marking DEAD states\n\
|
|
(by default DEAD = true)\n\
|
|
-e[ALGO] run emptiness check, expect an accepting run\n\
|
|
-E[ALGO] run emptiness check, expect no accepting run\n\
|
|
-C compute an accepting run (Counterexample) if it exists\n\
|
|
-D favor a deterministic translation over a small transition\n\
|
|
-gf output the automaton of the formula in dot format\n\
|
|
-gm output the model state-space in dot format\n\
|
|
-gK output the model state-space in Kripke format\n\
|
|
-gp output the product state-space in dot format\n\
|
|
-T time the different phases of the execution\n\
|
|
-z compress states to handle larger models\n\
|
|
-Z compress states (faster) assuming all values in [0 .. 2^28-1]\n\
|
|
";
|
|
exit(1);
|
|
}
|
|
|
|
int
|
|
checked_main(int argc, char **argv)
|
|
{
|
|
spot::timer_map tm;
|
|
|
|
bool use_timer = false;
|
|
|
|
enum { DotFormula, DotModel, DotProduct, EmptinessCheck, Kripke }
|
|
output = EmptinessCheck;
|
|
bool accepting_run = false;
|
|
bool expect_counter_example = false;
|
|
bool deterministic = false;
|
|
char *dead = 0;
|
|
int compress_states = 0;
|
|
|
|
const char* echeck_algo = "Cou99";
|
|
|
|
int dest = 1;
|
|
int n = argc;
|
|
for (int i = 1; i < n; ++i)
|
|
{
|
|
char* opt = argv[i];
|
|
if (*opt == '-')
|
|
{
|
|
switch (*++opt)
|
|
{
|
|
case 'C':
|
|
accepting_run = true;
|
|
break;
|
|
case 'd':
|
|
dead = opt + 1;
|
|
break;
|
|
case 'D':
|
|
deterministic = true;
|
|
break;
|
|
case 'e':
|
|
case 'E':
|
|
{
|
|
echeck_algo = opt + 1;
|
|
if (!*echeck_algo)
|
|
echeck_algo = "Cou99";
|
|
|
|
expect_counter_example = (*opt == 'e');
|
|
output = EmptinessCheck;
|
|
break;
|
|
}
|
|
case 'g':
|
|
switch (opt[1])
|
|
{
|
|
case 'm':
|
|
output = DotModel;
|
|
break;
|
|
case 'p':
|
|
output = DotProduct;
|
|
break;
|
|
case 'f':
|
|
output = DotFormula;
|
|
break;
|
|
case 'K':
|
|
output = Kripke;
|
|
break;
|
|
default:
|
|
goto error;
|
|
}
|
|
break;
|
|
case 'T':
|
|
use_timer = true;
|
|
break;
|
|
case 'z':
|
|
compress_states = 1;
|
|
break;
|
|
case 'Z':
|
|
compress_states = 2;
|
|
break;
|
|
default:
|
|
error:
|
|
std::cerr << "Unknown option `" << argv[i] << "'." << std::endl;
|
|
exit(1);
|
|
}
|
|
--argc;
|
|
}
|
|
else
|
|
{
|
|
argv[dest++] = argv[i];
|
|
}
|
|
}
|
|
|
|
if (argc != 3)
|
|
syntax(argv[0]);
|
|
|
|
spot::ltl::default_environment& env =
|
|
spot::ltl::default_environment::instance();
|
|
|
|
|
|
spot::ltl::atomic_prop_set ap;
|
|
auto dict = spot::make_bdd_dict();
|
|
spot::const_kripke_ptr model = nullptr;
|
|
spot::const_twa_ptr prop = nullptr;
|
|
spot::const_twa_ptr product = nullptr;
|
|
spot::emptiness_check_instantiator_ptr echeck_inst = nullptr;
|
|
int exit_code = 0;
|
|
spot::postprocessor post;
|
|
spot::ltl::formula deadf = nullptr;
|
|
spot::ltl::formula f = nullptr;
|
|
|
|
if (!dead || !strcasecmp(dead, "true"))
|
|
{
|
|
deadf = spot::ltl::formula::tt();
|
|
}
|
|
else if (!strcasecmp(dead, "false"))
|
|
{
|
|
deadf = spot::ltl::formula::ff();
|
|
}
|
|
else
|
|
{
|
|
deadf = env.require(dead);
|
|
}
|
|
|
|
if (output == EmptinessCheck)
|
|
{
|
|
const char* err;
|
|
echeck_inst = spot::make_emptiness_check_instantiator(echeck_algo, &err);
|
|
if (!echeck_inst)
|
|
{
|
|
std::cerr << "Failed to parse argument of -e/-E near `"
|
|
<< err << "'\n";
|
|
exit_code = 1;
|
|
goto safe_exit;
|
|
}
|
|
}
|
|
|
|
tm.start("parsing formula");
|
|
{
|
|
spot::ltl::parse_error_list pel;
|
|
f = spot::ltl::parse_infix_psl(argv[2], pel, env, false);
|
|
exit_code = spot::ltl::format_parse_errors(std::cerr, argv[2], pel);
|
|
}
|
|
tm.stop("parsing formula");
|
|
|
|
if (exit_code)
|
|
goto safe_exit;
|
|
|
|
tm.start("translating formula");
|
|
{
|
|
spot::translator trans(dict);
|
|
if (deterministic)
|
|
trans.set_pref(spot::postprocessor::Deterministic);
|
|
|
|
prop = trans.run(&f);
|
|
}
|
|
tm.stop("translating formula");
|
|
|
|
atomic_prop_collect(f, &ap);
|
|
|
|
if (output != DotFormula)
|
|
{
|
|
tm.start("loading ltsmin model");
|
|
model = spot::load_ltsmin(argv[1], dict, &ap, deadf,
|
|
compress_states, true);
|
|
tm.stop("loading ltsmin model");
|
|
|
|
if (!model)
|
|
{
|
|
exit_code = 1;
|
|
goto safe_exit;
|
|
}
|
|
|
|
if (output == DotModel)
|
|
{
|
|
tm.start("dot output");
|
|
spot::print_dot(std::cout, model);
|
|
tm.stop("dot output");
|
|
goto safe_exit;
|
|
}
|
|
if (output == Kripke)
|
|
{
|
|
tm.start("kripke output");
|
|
spot::kripke_save_reachable_renumbered(std::cout, model);
|
|
tm.stop("kripke output");
|
|
goto safe_exit;
|
|
}
|
|
}
|
|
|
|
if (output == DotFormula)
|
|
{
|
|
tm.start("dot output");
|
|
spot::print_dot(std::cout, prop);
|
|
tm.stop("dot output");
|
|
goto safe_exit;
|
|
}
|
|
|
|
product = spot::otf_product(model, prop);
|
|
|
|
if (output == DotProduct)
|
|
{
|
|
tm.start("dot output");
|
|
spot::print_dot(std::cout, product);
|
|
tm.stop("dot output");
|
|
goto safe_exit;
|
|
}
|
|
|
|
assert(echeck_inst);
|
|
|
|
{
|
|
auto ec = echeck_inst->instantiate(product);
|
|
bool search_many = echeck_inst->options().get("repeated");
|
|
assert(ec);
|
|
do
|
|
{
|
|
int memused = spot::memusage();
|
|
tm.start("running emptiness check");
|
|
spot::emptiness_check_result_ptr res;
|
|
try
|
|
{
|
|
res = ec->check();
|
|
}
|
|
catch (std::bad_alloc)
|
|
{
|
|
std::cerr << "Out of memory during emptiness check."
|
|
<< std::endl;
|
|
if (!compress_states)
|
|
std::cerr << "Try option -z for state compression." << std::endl;
|
|
exit_code = 2;
|
|
exit(exit_code);
|
|
}
|
|
tm.stop("running emptiness check");
|
|
memused = spot::memusage() - memused;
|
|
|
|
ec->print_stats(std::cout);
|
|
std::cout << memused << " pages allocated for emptiness check"
|
|
<< std::endl;
|
|
|
|
if (expect_counter_example == !res &&
|
|
(!expect_counter_example || ec->safe()))
|
|
exit_code = 1;
|
|
|
|
if (!res)
|
|
{
|
|
std::cout << "no accepting run found";
|
|
if (!ec->safe() && expect_counter_example)
|
|
{
|
|
std::cout << " even if expected" << std::endl;
|
|
std::cout << "this may be due to the use of the bit"
|
|
<< " state hashing technique" << std::endl;
|
|
std::cout << "you can try to increase the heap size "
|
|
<< "or use an explicit storage"
|
|
<< std::endl;
|
|
}
|
|
std::cout << std::endl;
|
|
break;
|
|
}
|
|
else if (accepting_run)
|
|
{
|
|
|
|
spot::tgba_run_ptr run;
|
|
tm.start("computing accepting run");
|
|
try
|
|
{
|
|
run = res->accepting_run();
|
|
}
|
|
catch (std::bad_alloc)
|
|
{
|
|
std::cerr << "Out of memory while looking for counterexample."
|
|
<< std::endl;
|
|
exit_code = 2;
|
|
exit(exit_code);
|
|
}
|
|
tm.stop("computing accepting run");
|
|
|
|
if (!run)
|
|
{
|
|
std::cout << "an accepting run exists" << std::endl;
|
|
}
|
|
else
|
|
{
|
|
tm.start("reducing accepting run");
|
|
run = spot::reduce_run(res->automaton(), run);
|
|
tm.stop("reducing accepting run");
|
|
|
|
tm.start("printing accepting run");
|
|
spot::print_tgba_run(std::cout, product, run);
|
|
tm.stop("printing accepting run");
|
|
}
|
|
}
|
|
else
|
|
{
|
|
std::cout << "an accepting run exists "
|
|
<< "(use -C to print it)" << std::endl;
|
|
}
|
|
}
|
|
while (search_many);
|
|
}
|
|
|
|
safe_exit:
|
|
if (use_timer)
|
|
tm.print(std::cout);
|
|
tm.reset_all(); // This helps valgrind.
|
|
return exit_code;
|
|
}
|
|
|
|
int
|
|
main(int argc, char **argv)
|
|
{
|
|
auto exit_code = checked_main(argc, argv);
|
|
|
|
// Additional checks to debug reference counts in formulas.
|
|
assert(spot::ltl::fnode::instances_check());
|
|
exit(exit_code);
|
|
}
|