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

Remove the negative_normal_form call from reduce().

Browse source 
* src/ltlvisit/simplify.cc (ltl_simplifier::simplify):
Convert in negative normal form if needed.
* src/ltlvisit/reduce.cc (reduce): Do not call
negative_normal_form().
This commit is contained in:
Alexandre Duret-Lutz 2011-08-24 16:08:40 +02:00
parent 1087c62356
commit c2335edb57
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ltlvisit/reduce.cc
View file

@ -27,7 +27,6 @@
#include "lunabbrev.hh" #include "lunabbrev.hh"
#include "simpfg.hh" #include "simpfg.hh"
#include "nenoform.hh"
#include "simplify.hh" #include "simplify.hh"
namespace spot namespace spot
@ -68,10 +67,6 @@ namespace spot
f1 = unabbreviate_logic(f); f1 = unabbreviate_logic(f);
f2 = simplify_f_g(f1); f2 = simplify_f_g(f1);
f1->destroy(); f1->destroy();
f1 = negative_normal_form(f2);
f2->destroy();
f2 = f1;
f = simplifier.simplify(f2); f = simplifier.simplify(f2);
f2->destroy(); f2->destroy();
} }

8
src/ltlvisit/simplify.cc
View file

@ -2222,7 +2222,13 @@ namespace spot
formula* formula*
ltl_simplifier::simplify(const formula* f) ltl_simplifier::simplify(const formula* f)
{ {
return const_cast<formula*>(simplify_recursively(f, cache_)); formula* neno = 0;
if (!f->is_in_nenoform())
f = neno = negative_normal_form(f);
formula* res = const_cast<formula*>(simplify_recursively(f, cache_));
if (neno)
neno->destroy();
return res;
} }
formula* formula*