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

Add a new length_boolone() function to fix an assert in randpsl.

Browse source 
* src/ltlvisit/length.hh (length_boolone): New function.
* src/ltlvisit/length.cc (length_boolone): Implement it using...
(length_boolone_visitor): ... this new visitor.
* src/ltltest/randltl.cc: Use length_boolone() to check the result
of the random generator, and ignore any formula larger (in
length()) than opt_f.  This fix a bug where the random formula
generator would sometime produce formula larger than requested,
because of the trivial rewriting of {f}[]->e as e|!f.
* src/ltltest/length.cc: Add option -b to call length_boolone().
* src/ltltest/length.test: Test length_boolone().
This commit is contained in:
Alexandre Duret-Lutz 2012-01-06 11:32:44 +01:00
parent c2ab4e781b
commit ed0dd0b48d
5 changed files with 90 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/ltlvisit/length.hh
View file

@ -33,13 +33,23 @@ namespace spot
/// \brief Compute the length of a formula.
/// \ingroup ltl_misc
///
/// The length of a formula is the number of atomic properties,
/// The length of a formula is the number of atomic propositions,
/// constants, and operators (logical and temporal) occurring in
/// the formula. spot::ltl::multop instances with n arguments
/// count only n-1; for instance <code>a | b | c</code>
/// has length 5, even if there is only as single <code>|</code> node
/// count for n-1; for instance <code>a | b | c</code> has length
/// 5, even if there is only as single <code>|</code> node
/// internally.
///
/// If squash_boolean is set, all Boolean formulae are assumed
/// to have length one.
int length(const formula* f);
/// \brief Compute the length of a formula, squashing Boolean formulae
/// \ingroup ltl_misc
///
/// This is similar to spot::ltl::length(), except all Boolean
/// formulae are assumed to have length one.
int length_boolone(const formula* f);
}
}