Commit a4ce9994 authored by Alexandre Duret-Lutz's avatar Alexandre Duret-Lutz
Browse files

sccinfo: adjust to work with alternating automata

* spot/twaalgos/sccinfo.cc: Consider universal edges as if they were
existential edges.
* spot/twaalgos/sccinfo.hh: Document that.
* spot/twaalgos/dot.cc: Allow option 's' again, for easy testing.
* tests/core/alternating.test: Adjust tests.
* tests/python/_altscc.ipynb: New file (more tests).
* tests/Makefile.am: Add it.
parent d2f471da
......@@ -699,12 +699,12 @@ namespace spot
}
}
auto si =
std::unique_ptr<scc_info>((opt_scc_ && !aut->is_alternating())
? new scc_info(aut) : nullptr);
std::unique_ptr<scc_info>(opt_scc_ ? new scc_info(aut) : nullptr);
start();
if (si)
{
if (!aut->is_alternating())
si->determine_unknown_acceptance();
unsigned sccs = si->scc_count();
......
......@@ -60,37 +60,43 @@ namespace spot
// Values < 0 number states that are part of incomplete SCCs being
// completed. 0 denotes non-visited states.
int num_; // Number of visited nodes, negated.
typedef twa_graph::graph_t::const_iterator iterator;
typedef std::pair<unsigned, iterator> pair_state_iter;
std::stack<pair_state_iter> todo_; // DFS stack. Holds (STATE,
// ITERATOR) pairs where
// ITERATOR is an iterator over
// the successors of STATE.
// ITERATOR should always be
// freed when TODO is popped,
// but STATE should not because
// it is used as a key in H.
// Setup depth-first search from the initial state.
unsigned init = aut->get_init_state_number();
num_ = -1;
h_[init] = num_;
int num_ = 0; // Number of visited nodes, negated.
struct stack_item {
unsigned src;
unsigned out_edge;
unsigned univ_pos;
};
// DFS stack. Holds (STATE, TRANS, UNIV_POS) pairs where TRANS is
// the current outgoing transition of STATE, and UNIV_POS is used
// when the transition is universal to iterate over all possible
// destinations.
std::stack<stack_item> todo_;
auto& gr = aut->get_graph();
// Setup depth-first search from the initial state. But we may
// have a conjunction of initial state in alternating automata.
for (unsigned init: aut->univ_dests(aut->get_init_state_number()))
{
int spi = h_[init];
if (spi > 0)
continue;
assert(spi == 0);
h_[init] = --num_;
root_.emplace_back(num_, 0U);
todo_.emplace(init, aut->out(init).begin());
todo_.emplace(stack_item{init, gr.state_storage(init).succ, 0});
live.emplace_back(init);
while (!todo_.empty())
{
// We are looking at the next successor in SUCC.
iterator succ = todo_.top().second;
unsigned tr_succ = todo_.top().out_edge;
// If there is no more successor, backtrack.
if (!succ)
if (!tr_succ)
{
// We have explored all successors of state CURR.
unsigned curr = todo_.top().first;
unsigned curr = todo_.top().src;
// Backtrack TODO_.
todo_.pop();
......@@ -125,8 +131,9 @@ namespace spot
// Gather all successor SCCs
for (unsigned s: nbs)
for (auto& t: aut->out(s))
for (unsigned d: aut->univ_dests(t))
{
unsigned n = sccof_[t.dst];
unsigned n = sccof_[d];
assert(n != -1U);
if (n == num)
continue;
......@@ -138,21 +145,31 @@ namespace spot
node_.back().accepting_ = accept;
bool reject = triv || !aut->acc().inf_satisfiable(acc);
// If the SCC acceptance is indeterminate, but has
// only one state and one transition, it is
// only self-loops with the same mark, it is
// necessarily rejecting, otherwise we would have
// found it to be accepting.
if (!accept && !reject && nbs.size() == 1)
{
unsigned selfloop = 0;
acc_cond::mark_t selfacc = 0;
bool first = true;
reject = true;
for (const auto& e: aut->out(nbs.front()))
if (e.src == e.dst)
for (unsigned d: aut->univ_dests(e))
if (e.src == d)
{
++selfloop;
if (selfloop > 1)
break;
if (first)
{
selfacc = e.acc;
first = false;
}
else if (selfacc != e.acc)
{
reject = false;
goto break2;
}
reject = selfloop <= 1;
}
}
break2:
node_.back().rejecting_ = reject;
root_.pop_back();
}
......@@ -161,11 +178,32 @@ namespace spot
// We have a successor to look at.
// Fetch the values we are interested in...
unsigned dest = succ->dst;
auto acc = succ->acc;
++todo_.top().second;
auto& e = gr.edge_storage(tr_succ);
unsigned dest = e.dst;
if ((int) dest < 0)
{
// Iterate over all destinations of an universal edge.
if (todo_.top().univ_pos == 0)
todo_.top().univ_pos = ~dest + 1;
const auto& v = gr.dests_vector();
dest = v[todo_.top().univ_pos];
// Last universal destination?
if (~e.dst + v[~e.dst] == todo_.top().univ_pos)
{
todo_.top().out_edge = e.next_succ;
todo_.top().univ_pos = 0;
}
else
{
++todo_.top().univ_pos;
}
}
else
{
todo_.top().out_edge = e.next_succ;
}
// We do not need SUCC from now on.
auto acc = e.acc;
// Are we going to a new state?
int spi = h_[dest];
......@@ -175,7 +213,7 @@ namespace spot
// for later processing.
h_[dest] = --num_;
root_.emplace_back(num_, acc);
todo_.emplace(dest, aut->out(dest).begin());
todo_.emplace(stack_item{dest, gr.state_storage(dest).succ, 0});
live.emplace_back(dest);
continue;
}
......@@ -200,7 +238,7 @@ namespace spot
int threshold = spi;
bool is_accepting = false;
// If this is a self-loop, check its acceptance alone.
if (dest == succ->src)
if (dest == e.src)
is_accepting = aut->acc().accepting(acc);
assert(!root_.empty());
......@@ -226,7 +264,7 @@ namespace spot
// This SCC is no longer trivial.
root_.back().trivial = false;
}
}
determine_usefulness();
}
......@@ -315,6 +353,9 @@ namespace spot
void scc_info::determine_unknown_acceptance()
{
if (aut_->is_alternating())
throw std::runtime_error("scc_info::determine_unknown_acceptance() "
"does not support alternating automata");
std::vector<bool> k;
unsigned n = scc_count();
bool changed = false;
......
......@@ -24,6 +24,18 @@
namespace spot
{
/// \brief Compute an SCC map and gather assorted information.
///
/// This takes twa_graph as input and compute its SCCs. This
/// class maps all input states to their SCCs, and vice-versa.
/// It allows iterating over all SCCs of the automaton, and check
/// their acceptance or non-acceptance.
///
/// Additionally this class can be used on alternating automata, but
/// in this case, universal transitions are handled like existential
/// transitions. It still make sense to check which states belong
/// to the same SCC, but the acceptance information computed by
/// this class is meaningless.
class SPOT_API scc_info
{
public:
......
......@@ -323,6 +323,7 @@ TESTS_ipython = \
# with a _.
TESTS_python = \
python/_aux.ipynb \
python/_altscc.ipynb \
python/accparse2.py \
python/alarm.py \
python/alternating.py \
......
......@@ -53,7 +53,6 @@ State: 6 "t"
--END--
EOF
# The 's' option should be ignored for alternating automata
autfilt --dot=bans alt.hoa >alt.dot
cat >expect.dot <<EOF
......@@ -66,7 +65,41 @@ digraph G {
-11 [label=<>,width=0,height=0,shape=none]
-11 -> 0
-11 -> 2
subgraph cluster_0 {
color=green
label=""
6 [label="t"]
}
subgraph cluster_1 {
color=red
label=""
4 [label="F(b)\n⓿"]
}
subgraph cluster_2 {
color=green
label=""
3 [label="GF(b)"]
}
subgraph cluster_3 {
color=green
label=""
2 [label="G(a)"]
}
subgraph cluster_4 {
color=red
label=""
1 [label="FG(a)\n⓿"]
}
subgraph cluster_5 {
color=red
label=""
5 [label="((a) U (b))\n⓿"]
}
subgraph cluster_6 {
color=black
label=""
0 [label="((((a) U (b)) && GF(b)) && FG(a))"]
}
0 -> -1 [label="b", dir=none]
-1 [label=<>,width=0,height=0,shape=none]
-1 -> 3
......@@ -76,24 +109,18 @@ digraph G {
-4 -> 5 [style=bold, color="#F15854"]
-4 -> 3 [style=bold, color="#F15854"]
-4 -> 1 [style=bold, color="#F15854"]
1 [label="FG(a)\n⓿"]
1 -> 2 [label="a"]
1 -> 1 [label="1"]
2 [label="G(a)"]
2 -> 2 [label="a"]
3 [label="GF(b)"]
3 -> 3 [label="b"]
3 -> -8 [label="!b", style=bold, color="#FAA43A", dir=none]
-8 [label=<>,width=0,height=0,shape=none]
-8 -> 4 [style=bold, color="#FAA43A"]
-8 -> 3 [style=bold, color="#FAA43A"]
4 [label="F(b)\n⓿"]
4 -> 6 [label="b"]
4 -> 4 [label="!b"]
5 [label="((a) U (b))\n⓿"]
5 -> 6 [label="b"]
5 -> 5 [label="a & !b"]
6 [label="t"]
6 -> 6 [label="1"]
}
EOF
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment