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

length: slight simplification

Browse source 
* src/ltlvisit/length.cc (length_boolone_visitor): Simplify.
* NEWS: Mention Alexandre's fix.
This commit is contained in:
Alexandre Duret-Lutz 2014-02-03 09:39:23 +01:00
parent 02334867da
commit 494dbe2041
2 changed files with 22 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

3
NEWS
View file

@ -3,6 +3,9 @@ New in spot 1.2.2a (not yet released)
* Bug fixes: * Bug fixes:
- More fixes for Python 3 compatibility. - More fixes for Python 3 compatibility.
- Fix calculation of length_boolone(), were 'Xa|b|c' was
considered as length 6 instead of 4 (because it is 'Xa|(b|a)'
were (b|a) is Boolean).
New in spot 1.2.2 (2014-01-24) New in spot 1.2.2 (2014-01-24)

40
src/ltlvisit/length.cc
View file

@ -1,7 +1,8 @@
// Copyright (C) 2010, 2012 Laboratoire de Recherche et Développement de // -*- coding: utf-8 -*-
// l'Epita (LRDE). // Copyright (C) 2010, 2012, 2014 Laboratoire de Recherche et
// Développement de l'Epita (LRDE).
// Copyright (C) 2004, 2005 Laboratoire d'Informatique de Paris 6 (LIP6), // Copyright (C) 2004, 2005 Laboratoire d'Informatique de Paris 6 (LIP6),
// département Systèmes Répartis Coopératifs (SRC), Université Pierre // département Systèmes Répartis Coopératifs (SRC), Université Pierre
// et Marie Curie. // et Marie Curie.
// //
// This file is part of Spot, a model checking library. // This file is part of Spot, a model checking library.
@ -72,7 +73,7 @@ namespace spot
visit(const unop* uo) visit(const unop* uo)
{ {
++result_; ++result_;
// Boolean formula have length one. // Boolean formulas have length one.
if (!uo->is_boolean()) if (!uo->is_boolean())
uo->child()->accept(*this); uo->child()->accept(*this);
} }
@ -80,7 +81,7 @@ namespace spot
virtual void virtual void
visit(const multop* mo) visit(const multop* mo)
{ {
// Boolean formula have length one. // Boolean formulas have length one.
if (mo->is_boolean()) if (mo->is_boolean())
{ {
++result_; ++result_;
@ -88,27 +89,24 @@ namespace spot
} }
unsigned s = mo->size(); unsigned s = mo->size();
unsigned operator_count = s - 1; unsigned bool_seen = 0;
for (unsigned i = 0; i < s; ++i) for (unsigned i = 0; i < s; ++i)
{ {
// Ignore all boolean values. We only want to count them once. const formula* f = mo->nth(i);
if (!mo->nth(i)->is_boolean()) // Ignore all Boolean children. We only want to count them once.
mo->nth(i)->accept(*this); if (f->is_boolean())
++bool_seen;
else else
--operator_count; f->accept(*this);
} }
// if operator_count has decreased, it means that we have encountered // "a & b & c" should count for 5, even though it is stored
// boolean values. // as And(a,b,c). So add the number of operators here (it
if (operator_count < s - 1) // is either s - 1 or s - bool_seen depending on whether
{ // Boolean children were encountered). If Boolean were
++result_; // seen, also add one (!!bool_seen) to account for the
++operator_count; // "global" Boolean term.
} result_ += s - !bool_seen - bool_seen + !!bool_seen;
// "a & b & c" should count for 5, even though it is
// stored as And(a,b,c).
result_ += operator_count;
} }
}; };