* src/ltltest/reduc.cc (main): More cases to test.
* src/ltlvisit/basicreduce.cc (basic_reduce_visitor::visit): Simplify the formula again after FX->XF and GX->XG permutations. This is so that formulae like GFXXa become GFa and not just GFXa. * src/ltlvisit/contain.cc (reduce_tau03_visitor): Fix a typo in the rules for i|j or i&j, resulting in missing simplifications.
This commit is contained in:
parent
b1c820af4d
commit
78d37fa126
4 changed files with 46 additions and 12 deletions
|
|
@ -1,6 +1,6 @@
|
|||
// Copyright (C) 2004, 2006 Laboratoire d'Informatique de Paris 6 (LIP6),
|
||||
// département Systèmes Répartis Coopératifs (SRC), Université Pierre
|
||||
// et Marie Curie.
|
||||
// Copyright (C) 2004, 2006, 2007 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.
|
||||
//
|
||||
|
|
@ -83,6 +83,28 @@ main(int argc, char** argv)
|
|||
case 9:
|
||||
o = spot::ltl::Reduce_All;
|
||||
break;
|
||||
case 10:
|
||||
o = (spot::ltl::Reduce_Basics
|
||||
| spot::ltl::Reduce_Containment_Checks_Stronger);
|
||||
break;
|
||||
case 11:
|
||||
o = (spot::ltl::Reduce_Syntactic_Implications
|
||||
| spot::ltl::Reduce_Containment_Checks_Stronger);
|
||||
break;
|
||||
case 12:
|
||||
o = (spot::ltl::Reduce_Basics
|
||||
| spot::ltl::Reduce_Syntactic_Implications
|
||||
| spot::ltl::Reduce_Containment_Checks_Stronger);
|
||||
break;
|
||||
case 13:
|
||||
o = (spot::ltl::Reduce_Eventuality_And_Universality
|
||||
| spot::ltl::Reduce_Containment_Checks_Stronger);
|
||||
break;
|
||||
case 14:
|
||||
o = (spot::ltl::Reduce_Basics
|
||||
| spot::ltl::Reduce_Eventuality_And_Universality
|
||||
| spot::ltl::Reduce_Containment_Checks_Stronger);
|
||||
break;
|
||||
default:
|
||||
return 2;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue