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

Implement star-normal-form rewriting.

Browse source 
* src/ltlvisit/snf.cc, src/ltlvisit/snf.hh: New files.
* src/ltlvisit/Makefile.am: Distribute them.
* src/ltlvisit/simplify.cc, src/ltlvisit/simplify.hh: Call snf(f) for
all f[*].
* src/ltltest/reduccmp.test: Test it.
* doc/tl/tl.tex, doc/tl/tl.bib: Document it.
This commit is contained in:
Alexandre Duret-Lutz 2012-04-25 18:50:31 +02:00
parent e7cf7b422d
commit 6eb830c8ae
8 changed files with 327 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/ltlvisit/simplify.cc
View file

@ -32,6 +32,7 @@
#include "ltlast/visitor.hh"
#include "ltlvisit/contain.hh"
#include "ltlvisit/tostring.hh"
#include "ltlvisit/snf.hh"
#include <cassert>
namespace spot
@ -95,6 +96,16 @@ namespace spot
old->first.second->destroy();
}
}
{
snf_cache::iterator i = snf_cache_.begin();
snf_cache::iterator end = snf_cache_.end();
while (i != end)
{
snf_cache::iterator old = i++;
old->second->destroy();
old->first->destroy();
}
}
dict->unregister_all_my_variables(this);
}
@ -184,8 +195,8 @@ namespace spot
break;
}
case multop::AndNLM:
case multop::AndRat:
case multop::OrRat:
case multop::AndRat:
case multop::OrRat:
case multop::Concat:
case multop::Fusion:
assert(!"Unsupported operator");
@ -327,11 +338,18 @@ namespace spot
simplified_[orig->clone()] = simplified->clone();
}
const formula*
star_normal_form(const formula* f)
{
return ltl::star_normal_form(f, &snf_cache_);
}
private:
f2b_map as_bdd_;
f2f_map simplified_;
f2f_map nenoform_;
syntimpl_cache_t syntimpl_;
snf_cache snf_cache_;
};
@ -437,11 +455,10 @@ namespace spot
void
visit(bunop* bo)
{
// !(a*) is not simplified, whatever that means
// !(a*) should never occur.
assert(!negated_);
result_ = bunop::instance(bo->op(), recurse_(bo->child(), false),
bo->min(), bo->max());
if (negated_)
result_ = unop::instance(unop::Not, result_);
}
formula* equiv_or_xor(bool equiv, formula* f1, formula* f2)
@ -1002,8 +1019,23 @@ namespace spot
void
visit(bunop* bo)
{
result_ = bunop::instance(bo->op(), recurse(bo->child()),
bo->min(), bo->max());
bunop::type op = bo->op();
unsigned min = bo->min();
formula* h = recurse(bo->child());
switch (op)
{
case bunop::Star:
if (h->accepts_eword())
min = 0;
if (min == 0)
{
const formula* s = c_->star_normal_form(h);
h->destroy();
h = const_cast<formula*>(s);
}
result_ = bunop::instance(op, h, min, bo->max());
break;
}
}
void
@ -3724,6 +3756,12 @@ namespace spot
return cache_->as_bdd(f);
}
const formula*
ltl_simplifier::star_normal_form(const formula* f)
{
return cache_->star_normal_form(f);
}
bdd_dict*
ltl_simplifier::get_dict() const
{