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

Add support for --check=strength

Browse source 
* src/twaalgos/strength.cc, src/twaalgos/strength.hh (check_strength):
New function.
* src/bin/common_aoutput.cc: Add --check=strength.
* src/tests/strength.test: New file.
* src/tests/Makefile.am: Add it.
* doc/org/hoa.org, NEWS: Document it.
This commit is contained in:
Alexandre Duret-Lutz 2015-11-07 21:40:04 +01:00
parent f4cf0f4078
commit 3428fb32cd
7 changed files with 223 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/twaalgos/strength.cc
View file

@ -26,8 +26,8 @@ namespace spot
{
namespace
{
template <bool terminal>
bool is_type_automaton(const const_twa_graph_ptr& aut, scc_info* si)
template <bool terminal, bool set = false>
bool is_type_automaton(const twa_graph_ptr& aut, scc_info* si)
{
// Create an scc_info if the user did not give one to us.
bool need_si = !si;
@ -35,7 +35,8 @@ namespace spot
si = new scc_info(aut);
si->determine_unknown_acceptance();
bool result = true;
bool is_weak = true;
bool is_term = true;
unsigned n = si->scc_count();
for (unsigned i = 0; i < n; ++i)
{
@ -54,33 +55,49 @@ namespace spot
}
else if (m != t.acc)
{
result = false;
is_weak = false;
goto exit;
}
}
if (terminal && si->is_accepting_scc(i) && !is_complete_scc(*si, i))
{
result = false;
break;
is_term = false;
if (!set)
break;
}
}
exit:
if (need_si)
delete si;
return result;
if (set)
{
if (terminal)
aut->prop_terminal(is_term && is_weak);
aut->prop_weak(is_weak);
}
return is_weak && is_term;
}
}
bool
is_terminal_automaton(const const_twa_graph_ptr& aut, scc_info* si)
{
return aut->prop_terminal() || is_type_automaton<true>(aut, si);
return (aut->prop_terminal() ||
is_type_automaton<true>(std::const_pointer_cast<twa_graph>(aut),
si));
}
bool
is_weak_automaton(const const_twa_graph_ptr& aut, scc_info* si)
{
return aut->prop_weak() || is_type_automaton<false>(aut, si);
return (aut->prop_weak() ||
is_type_automaton<false>(std::const_pointer_cast<twa_graph>(aut),
si));
}
void check_strength(const twa_graph_ptr& aut, scc_info* si)
{
is_type_automaton<true, true>(aut, si);
}
bool is_safety_mwdba(const const_twa_graph_ptr& aut)

10
src/twaalgos/strength.hh
View file

@ -58,4 +58,14 @@ namespace spot
SPOT_API bool
is_safety_mwdba(const const_twa_graph_ptr& aut);
/// \brief Whether an automaton is weak or terminal.
///
/// This sets the "weak" and "terminal" property as appropriate.
///
/// \param aut the automaton to check
///
/// \param sm an scc_info object for the automaton if available (it
/// will be built otherwise).
SPOT_API void
check_strength(const twa_graph_ptr& aut, scc_info* sm = nullptr);
}