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

randltl: gracefully handle the absence of unary or binary operators.

Browse source 
* src/ltlvisit/randomltl.cc: Fix generation of formulas when unary or
binary operators are missing.
* src/ltlvisit/apcollect.cc, src/ltlvisit/apcollect.hh
(destroy_atomic_prop_set): New function.
* src/bin/randltl.cc: Use it, and also honnor --boolean-priorities
when generating SEREs.
* src/ltltest/rand.test: New file.
* src/ltltest/Makefile.am: Add it.
This commit is contained in:
Alexandre Duret-Lutz 2014-02-05 18:10:48 +01:00
parent 4911e7dc1f
commit 50bdc24514
6 changed files with 154 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/bin/randltl.cc
View file

@ -1,6 +1,6 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2012, 2013 Laboratoire de Recherche et Développement
// de l'Epita (LRDE).
// Copyright (C) 2012, 2013, 2014 Laboratoire de Recherche et
// Développement de l'Epita (LRDE).
//
// This file is part of Spot, a model checking library.
//
@ -283,7 +283,8 @@ main(int argc, char** argv)
break;
case OutputSERE:
rf = rs = new spot::ltl::random_sere(&aprops);
tok_pS = rf->parse_options(opt_pS);
tok_pS = rs->parse_options(opt_pS);
tok_pB = rs->rb.parse_options(opt_pB);
if (opt_pL)
error(2, 0, "option --ltl-priorities unsupported for SERE output");
break;
@ -335,6 +336,7 @@ main(int argc, char** argv)
default:
error(2, 0, "internal error: unknown type of output");
}
destroy_atomic_prop_set(aprops);
exit(0);
}
@ -409,10 +411,6 @@ main(int argc, char** argv)
(*i)->destroy();
}
// Cleanup the atomic_prop set.
{
spot::ltl::atomic_prop_set::const_iterator i = aprops.begin();
while (i != aprops.end())
(*(i++))->destroy();
}
destroy_atomic_prop_set(aprops);
return 0;
}