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

tl: rename ltl_simplifier to tl_simplifier

Browse source 
* doc/org/tut01.org, doc/tl/tl.tex, src/bin/common_r.hh,
src/bin/ltlfilt.cc, src/tests/equalsf.cc, src/tests/ikwiad.cc,
src/tests/randtgba.cc, src/tests/reduc.cc, src/tests/syntimpl.cc,
src/tl/nenoform.cc, src/tl/randomltl.cc, src/tl/randomltl.hh,
src/tl/simplify.cc, src/tl/simplify.hh, src/twaalgos/ltl2tgba_fm.cc,
src/twaalgos/ltl2tgba_fm.hh, src/twaalgos/stutter.cc,
src/twaalgos/translate.cc, src/twaalgos/translate.hh,
wrap/python/ajax/spotcgi.in, wrap/python/spot.py,
wrap/python/tests/interdep.py: Rename ltl_simplifier to tl_simplifier.
* NEWS: Mention it.
This commit is contained in:
Alexandre Duret-Lutz 2015-10-18 13:33:35 +02:00
parent 21be883cf6
commit 176c9e2e17
23 changed files with 119 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/twaalgos/ltl2tgba_fm.cc
View file

@ -133,7 +133,7 @@ namespace spot
{
public:
translate_dict(twa_graph_ptr& a, ltl_simplifier* ls, bool exprop,
translate_dict(twa_graph_ptr& a, tl_simplifier* ls, bool exprop,
bool single_acc, bool unambiguous)
: a_(a),
dict(a->get_dict()),
@ -156,7 +156,7 @@ namespace spot
twa_graph_ptr& a_;
bdd_dict_ptr dict;
ltl_simplifier* ls;
tl_simplifier* ls;
mark_tools mt;
typedef bdd_dict::fv_map fv_map;
@ -1886,9 +1886,9 @@ namespace spot
ltl_to_tgba_fm(formula f2, const bdd_dict_ptr& dict,
bool exprop, bool symb_merge, bool branching_postponement,
bool fair_loop_approx, const atomic_prop_set* unobs,
ltl_simplifier* simplifier, bool unambiguous)
tl_simplifier* simplifier, bool unambiguous)
{
ltl_simplifier* s = simplifier;
tl_simplifier* s = simplifier;
// Simplify the formula, if requested.
if (s)
@ -1903,7 +1903,7 @@ namespace spot
// negations on the atomic propositions. We also suppress
// logic abbreviations such as <=>, =>, or XOR, since they
// would involve negations at the BDD level.
s = new ltl_simplifier(dict);
s = new tl_simplifier(dict);
f2 = s->negative_normal_form(f2, false);
}
assert(f2.is_in_nenoform());

4
src/twaalgos/ltl2tgba_fm.hh
View file

@ -101,7 +101,7 @@ namespace spot
/// representing each state of the automaton will be simplified
/// before computing the successor. \a simpl should be configured
/// for the type of reduction you want, see
/// spot::ltl_simplifier. This idea is taken from the
/// spot::tl_simplifier. This idea is taken from the
/// following paper.
/** \verbatim
@InProceedings{ thirioux.02.fmics,
@ -145,6 +145,6 @@ namespace spot
bool branching_postponement = false,
bool fair_loop_approx = false,
const atomic_prop_set* unobs = nullptr,
ltl_simplifier* simplifier = nullptr,
tl_simplifier* simplifier = nullptr,
bool unambiguous = false);
}

2
src/twaalgos/stutter.cc
View file

@ -558,7 +558,7 @@ namespace spot
bool res;
if (algo == 0) // Equivalence check
{
ltl_simplifier ls;
tl_simplifier ls;
res = ls.are_equivalent(f, g);
}
else

4
src/twaalgos/translate.cc
View file

@ -43,7 +43,7 @@ namespace spot
void translator::build_simplifier(const bdd_dict_ptr& dict)
{
ltl_simplifier_options options(false, false, false);
tl_simplifier_options options(false, false, false);
switch (level_)
{
case High:
@ -58,7 +58,7 @@ namespace spot
options.event_univ = true;
// fall through
}
simpl_owned_ = simpl_ = new ltl_simplifier(options, dict);
simpl_owned_ = simpl_ = new tl_simplifier(options, dict);
}
twa_graph_ptr translator::run(formula* f)

6
src/twaalgos/translate.hh
View file

@ -47,7 +47,7 @@ namespace spot
class SPOT_API translator: protected postprocessor
{
public:
translator(ltl_simplifier* simpl, const option_map* opt = nullptr)
translator(tl_simplifier* simpl, const option_map* opt = nullptr)
: postprocessor(opt), simpl_(simpl), simpl_owned_(nullptr)
{
assert(simpl);
@ -114,8 +114,8 @@ namespace spot
void build_simplifier(const bdd_dict_ptr& dict);
private:
ltl_simplifier* simpl_;
ltl_simplifier* simpl_owned_;
tl_simplifier* simpl_;
tl_simplifier* simpl_owned_;
int comp_susp_;
int early_susp_;
int skel_wdba_;