Move language containment into ltl_simplifier.

* src/ltlvisit/simplify.cc: Integrate the tau03
containment rules.
* src/ltlvisit/simplify.hh: Add options to select simplifications.
* src/ltlvisit/reduce.cc (reduce): Do not call reduce_tau03().
* src/ltlvisit/contain.cc (reduce_tau03_visitor): Remove.
(reduce_tau03): Implement it using ltl_simplifier.
This commit is contained in:
Alexandre Duret-Lutz 2011-08-24 15:54:06 +02:00
parent 82b42494db
commit 1087c62356
4 changed files with 442 additions and 539 deletions

View file

@ -28,7 +28,6 @@
#include "lunabbrev.hh"
#include "simpfg.hh"
#include "nenoform.hh"
#include "contain.hh"
#include "simplify.hh"
namespace spot
@ -73,20 +72,8 @@ namespace spot
f2->destroy();
f2 = f1;
f1 = simplifier.simplify(f2);
f = simplifier.simplify(f2);
f2->destroy();
f2 = f1;
if (opt & (Reduce_Containment_Checks
| Reduce_Containment_Checks_Stronger))
{
formula* f1 =
reduce_tau03(f2,
opt & Reduce_Containment_Checks_Stronger);
f2->destroy();
f2 = f1;
}
f = f2;
}
prev->destroy();