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

improve cleanup_parity() and colorize_parity()

Fixes #384.

* spot/twaalgos/parity.cc: Here.
* tests/core/parity2.test, tests/python/highlighting.ipynb,
tests/python/parity.py: Adjust test cases.
* tests/python/parity.ipynb: Improve the presentation.
* NEWS: Mention the change.
parent f0b77e21
...@@ -103,6 +103,11 @@ New in spot 2.7.5.dev (not yet released) ...@@ -103,6 +103,11 @@ New in spot 2.7.5.dev (not yet released)
F(G(a & Fb) = FGa & GFb (unless option "reduce_size_strictly") F(G(a & Fb) = FGa & GFb (unless option "reduce_size_strictly")
G(F(a & Gb)) = GFa & FGb (unless option "reduce_size_strictly") G(F(a & Gb)) = GFa & FGb (unless option "reduce_size_strictly")
- cleanup_parity() and colorize_parity() were cleaned up a bit,
resulting in fewer colors used in some cases. In particular,
colorize_parity() learned that coloring transitiant edges does not
require the introduction of a new color.
New in spot 2.7.5 (2019-06-05) New in spot 2.7.5 (2019-06-05)
Build: Build:
......
// -*- coding: utf-8 -*- // -*- coding: utf-8 -*-
// Copyright (C) 2016, 2018 Laboratoire de Recherche et Développement // Copyright (C) 2016, 2018, 2019 Laboratoire de Recherche et Développement
// de l'Epita (LRDE). // de l'Epita (LRDE).
// //
// This file is part of Spot, a model checking library. // This file is part of Spot, a model checking library.
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <spot/twa/twagraph.hh> #include <spot/twa/twagraph.hh>
#include <spot/twaalgos/product.hh> #include <spot/twaalgos/product.hh>
#include <spot/twaalgos/complete.hh> #include <spot/twaalgos/complete.hh>
#include <spot/twaalgos/sccinfo.hh>
#include <vector> #include <vector>
#include <utility> #include <utility>
#include <functional> #include <functional>
...@@ -165,120 +166,132 @@ namespace spot ...@@ -165,120 +166,132 @@ namespace spot
twa_graph_ptr twa_graph_ptr
cleanup_parity_here(twa_graph_ptr aut, bool keep_style) cleanup_parity_here(twa_graph_ptr aut, bool keep_style)
{ {
unsigned num_sets = aut->num_sets();
if (num_sets == 0)
return aut;
bool current_max; bool current_max;
bool current_odd; bool current_odd;
if (!aut->acc().is_parity(current_max, current_odd, true)) if (!aut->acc().is_parity(current_max, current_odd, true))
input_is_not_parity("cleanup_parity"); input_is_not_parity("cleanup_parity");
auto num_sets = aut->num_sets();
if (num_sets == 0)
return aut;
// Compute all the used sets // Gather all the used colors, while leaving only one per edge.
auto used_in_aut = acc_cond::mark_t(); auto used_in_aut = acc_cond::mark_t();
for (auto& t: aut->edges()) acc_cond::mark_t allsets = aut->acc().all_sets();
if (current_max)
for (auto& t: aut->edges())
{
if (auto maxset = (t.acc & allsets).max_set())
{
t.acc = acc_cond::mark_t{maxset - 1};
used_in_aut |= t.acc;
}
else
{
t.acc = acc_cond::mark_t{};
}
}
else
for (auto& t: aut->edges())
{
t.acc = (t.acc & allsets).lowest();
used_in_aut |= t.acc;
}
if (used_in_aut)
{ {
// leave only one color on each transition
if (current_max) if (current_max)
// If max even or max odd: if 0 is not used, we can remove 1, if
// 2 is not used, we can remove 3, etc.
// This is obvious from the encoding:
// max odd n = ... Inf(3) | (Fin(2) & (Inf(1) | Fin(0)))
// max even n = ... Fin(3) & (Inf(2) | (Fin(1) & Inf(0)))
{ {
auto maxset = t.acc.max_set(); unsigned n = 0;
if (maxset) while (n + 1 < num_sets && !used_in_aut.has(n))
t.acc = acc_cond::mark_t{maxset - 1}; {
used_in_aut.clear(n + 1);
n += 2;
}
} }
else else
// min even and min odd simply work the other way around:
// min even 4 = Inf(0) | (Fin(1) & (Inf(2) | Fin(3)))
// min odd 4 = Fin(0) & (Inf(1) | (Fin(2) & Inf(3)))
{ {
t.acc = t.acc.lowest(); int n = num_sets - 1;
while (n >= 1 && !used_in_aut.has(n))
{
used_in_aut.clear(n - 1);
n -= 2;
}
} }
// recall colors used in the automaton
used_in_aut |= t.acc;
} }
// remove from the acceptance condition the unused one (starting from the // If no color needed in the automaton, exit early.
// least significant) if (!used_in_aut)
auto useful = used_in_aut;
int useful_min = 0;
int useful_max = num_sets-1;
if (!current_max)
{ {
int n = num_sets-1; if ((current_max && current_odd)
while (n >= 0 && !useful.has(n)) || (!current_max && current_odd == (num_sets & 1)))
{ aut->set_acceptance(0, acc_cond::acc_code::t());
if (n > 0) else
useful.clear(n-1); aut->set_acceptance(0, acc_cond::acc_code::f());
n -= 2; for (auto& e: aut->edges())
} e.acc = {};
useful_max = n; return aut;
}
else
{
unsigned n = 0;
while (n < num_sets && !useful.has(n))
{
useful.clear(n+1);
n += 2;
}
useful_min = n;
} }
if (used_in_aut)
{
// Never remove the least significant acceptance set, and mark the
// acceptance set 0 to keep the style if needed.
if (keep_style && useful_min <= useful_max)
{
useful.set(useful_min);
useful.set(useful_max);
}
// Fill the vector shift with the new acceptance sets
std::vector<unsigned> shift(num_sets);
int prev_used = -1;
bool change_style = false;
unsigned new_index = 0;
for (auto i = 0U; i < num_sets; ++i)
if (useful.has(i))
{
if (prev_used == -1)
change_style = i % 2 != 0;
else if ((i + prev_used) % 2 != 0)
++new_index;
shift[i] = new_index;
prev_used = i;
}
// Update all the transitions with the vector shift // Renumber colors. Two used colors separated by a unused color
for (auto& t: aut->edges()) // can be merged.
std::vector<unsigned> rename(num_sets);
int prev_used = -1;
bool change_style = false;
unsigned new_index = 0;
for (auto i = 0U; i < num_sets; ++i)
if (used_in_aut.has(i))
{ {
t.acc &= useful; if (prev_used == -1)
auto maxset = t.acc.max_set(); {
if (maxset) if (i & 1)
t.acc = acc_cond::mark_t{shift[maxset - 1]}; {
if (keep_style)
new_index = 1;
else
change_style = true;
}
}
else if ((i + prev_used) & 1)
++new_index;
rename[i] = new_index;
prev_used = i;
} }
assert(prev_used >= 0);
auto new_num_sets = new_index + 1; // Update all colors according to RENAME.
if (!useful) // Using max_set or min_set makes no difference since
{ // there is now at most one color per edge.
new_num_sets = 0; for (auto& t: aut->edges())
if (current_max) {
change_style = false; acc_cond::mark_t m = t.acc & used_in_aut;
else unsigned color = m.max_set();
change_style = num_sets % 2 == 1; if (color)
} t.acc = acc_cond::mark_t{rename[color - 1]};
else
t.acc = m;
}
if (new_num_sets < num_sets) unsigned new_num_sets = new_index + 1;
{ if (new_num_sets < num_sets)
auto new_acc = {
acc_cond::acc_code::parity(current_max, auto new_acc =
current_odd != change_style, acc_cond::acc_code::parity(current_max,
new_num_sets); current_odd != change_style,
aut->set_acceptance(new_num_sets, new_acc); new_num_sets);
} aut->set_acceptance(new_num_sets, new_acc);
} }
else else
{ {
if ((current_max && current_odd) assert(!change_style);
|| (!current_max && current_odd != (num_sets % 2 == 0)))
aut->set_acceptance(0, acc_cond::acc_code::t());
else
aut->set_acceptance(0, acc_cond::acc_code::f());
} }
return aut; return aut;
} }
...@@ -297,44 +310,79 @@ namespace spot ...@@ -297,44 +310,79 @@ namespace spot
bool current_odd; bool current_odd;
if (!aut->acc().is_parity(current_max, current_odd, true)) if (!aut->acc().is_parity(current_max, current_odd, true))
input_is_not_parity("colorize_parity"); input_is_not_parity("colorize_parity");
if (!aut->is_existential())
throw std::runtime_error
("colorize_parity_here() does not support alternation");
bool has_empty = false; bool has_empty_in_scc = false;
for (const auto& e: aut->edges()) {
if (!e.acc) scc_info si(aut, scc_info_options::NONE);
{ for (const auto& e: aut->edges())
has_empty = true; if (!e.acc && si.scc_of(e.src) == si.scc_of(e.dst))
break; {
} has_empty_in_scc = true;
auto num_sets = aut->num_sets(); break;
}
}
unsigned num_sets = aut->num_sets();
bool new_odd = current_odd;
int incr = 0; int incr = 0;
if (has_empty) unsigned empty = current_max ? 0 : num_sets - 1;
if (has_empty_in_scc)
{ {
// If the automaton has a transition that belong to any set, we need to // If the automaton has an SCC transition that belongs to no set
// introduce a new acceptance set. // (called "empty trans." below), we may need to introduce a
// We may want to add a second acceptance set to keep the style of // new acceptance set. What to do depends on the kind
// the parity acceptance // (min/max) and style (odd/even) of parity acceptance and the
incr = 1 + (keep_style && current_max); // number (n) of colors used.
num_sets += incr; //
bool new_style = current_odd == (keep_style || !current_max); // | kind/style | n | empty tr. | other tr. | result |
auto new_acc = acc_cond::acc_code::parity(current_max, // |------------+-----+------------+-----------+--------------|
new_style, num_sets); // | max odd | any | set to {0} | add 1 | max even n+1 |
// | max even | any | set to {0} | add 1 | max odd n+1 |
// | min odd | any | set to {n} | unchanged | min odd n+1 |
// | min even | any | set to {n} | unchanged | min even n+1 |
//
// In the above table, the "max" cases both change their style
// We may want to add a second acceptance set to keep the
// style:
//
// | kind/style | n | empty tr. | other tr. | result |
// |------------+-----+------------+-----------+--------------|
// | max odd | any | set to {1} | add 2 | max odd n+2 |
// | max even | any | set to {1} | add 2 | max even n+2 |
if (current_max)
{
incr = 1 + keep_style;
num_sets += incr;
new_odd = current_odd == keep_style;
empty = keep_style;
}
else
{
empty = num_sets++;
}
auto new_acc =
acc_cond::acc_code::parity(current_max, new_odd, num_sets);
aut->set_acceptance(num_sets, new_acc); aut->set_acceptance(num_sets, new_acc);
} }
if (current_max) if (current_max)
{ {
--incr; --incr;
for (auto& e: aut->edges()) for (auto& e: aut->edges())
{ {
auto maxset = e.acc.max_set(); auto maxset = e.acc.max_set();
e.acc = acc_cond::mark_t{maxset ? maxset + incr : incr}; e.acc = acc_cond::mark_t{maxset ? maxset + incr : empty};
} }
} }
else else
{ {
auto unused_mark = num_sets - incr;
for (auto& e: aut->edges()) for (auto& e: aut->edges())
e.acc = e.acc ? e.acc.lowest() : acc_cond::mark_t{unused_mark}; e.acc = e.acc ? e.acc.lowest() : acc_cond::mark_t{empty};
} }
return aut; return aut;
} }
......
...@@ -245,12 +245,12 @@ name: "(p0 W XXGp0) & G(Fp1 & FGp2)" ...@@ -245,12 +245,12 @@ name: "(p0 W XXGp0) & G(Fp1 & FGp2)"
States: 5 States: 5
Start: 0 Start: 0
AP: 3 "p0" "p1" "p2" AP: 3 "p0" "p1" "p2"
acc-name: parity max even 3 acc-name: Streett 1
Acceptance: 3 Inf(2) | (Fin(1) & Inf(0)) Acceptance: 2 Fin(0) | Inf(1)
properties: trans-labels explicit-labels trans-acc colored properties: trans-labels explicit-labels trans-acc colored
--BODY-- --BODY--
State: 0 State: 0
[0] 0 {1} [0] 0 {0}
[!0] 1 {0} [!0] 1 {0}
[0&1&2] 2 {0} [0&1&2] 2 {0}
State: 1 State: 1
...@@ -258,14 +258,14 @@ State: 1 ...@@ -258,14 +258,14 @@ State: 1
[1&2] 4 {0} [1&2] 4 {0}
State: 2 State: 2
[!0] 1 {0} [!0] 1 {0}
[0&!1&2] 2 {1} [0&!1&2] 2 {0}
[0&1&2] 2 {2} [0&1&2] 2 {1}
State: 3 State: 3
[0] 3 {1} [0] 3 {0}
[0&1&2] 4 {0} [0&1&2] 4 {0}
State: 4 State: 4
[0&!1&2] 4 {1} [0&!1&2] 4 {0}
[0&1&2] 4 {2} [0&1&2] 4 {1}
--END-- --END--
HOA: v1 HOA: v1
name: "FGa" name: "FGa"
...@@ -304,24 +304,24 @@ name: "(p0 W XXGp0) & G(Fp1 & FGp2)" ...@@ -304,24 +304,24 @@ name: "(p0 W XXGp0) & G(Fp1 & FGp2)"
States: 5 States: 5
Start: 0 Start: 0
AP: 3 "p0" "p1" "p2" AP: 3 "p0" "p1" "p2"
acc-name: parity min odd 4 acc-name: parity min odd 3
Acceptance: 4 Fin(0) & (Inf(1) | (Fin(2) & Inf(3))) Acceptance: 3 Fin(0) & (Inf(1) | Fin(2))
properties: trans-labels explicit-labels trans-acc colored properties: trans-labels explicit-labels trans-acc colored
--BODY-- --BODY--
State: 0 State: 0
[0] 0 {2} [0] 0 {2}
[!0] 1 {3} [!0] 1 {2}
[0&1&2] 2 {3} [0&1&2] 2 {2}
State: 1 State: 1
[t] 3 {3} [t] 3 {2}
[1&2] 4 {3} [1&2] 4 {2}
State: 2 State: 2
[!0] 1 {3} [!0] 1 {2}
[0&1&2] 2 {1} [0&1&2] 2 {1}
[0&!1&2] 2 {2} [0&!1&2] 2 {2}
State: 3 State: 3
[0] 3 {2} [0] 3 {2}
[0&1&2] 4 {3} [0&1&2] 4 {2}
State: 4 State: 4
[0&1&2] 4 {1} [0&1&2] 4 {1}
[0&!1&2] 4 {2} [0&!1&2] 4 {2}
...@@ -980,21 +980,21 @@ name: "(p0 W XXGp0) & G(Fp1 & FGp2)" ...@@ -980,21 +980,21 @@ name: "(p0 W XXGp0) & G(Fp1 & FGp2)"
States: 5 States: 5
Start: 0 Start: 0
AP: 3 "p0" "p1" "p2" AP: 3 "p0" "p1" "p2"
acc-name: parity min odd 4 acc-name: parity min odd 3
Acceptance: 4 Fin(0) & (Inf(1) | (Fin(2) & Inf(3))) Acceptance: 3 Fin(0) & (Inf(1) | Fin(2))
properties: trans-labels explicit-labels trans-acc colored properties: trans-labels explicit-labels trans-acc colored
properties: deterministic properties: deterministic
--BODY-- --BODY--
State: 0 State: 0
[0&!1 | 0&!2] 0 {2} [0&!1 | 0&!2] 0 {2}
[!0] 1 {3} [!0] 1 {2}
[0&1&2] 2 {1} [0&1&2] 2 {1}
State: 1 State: 1
[!1 | !2] 3 {3} [!1 | !2] 3 {2}
[1&2] 4 {3} [1&2] 4 {2}
State: 2 State: 2
[0&!2] 0 {0} [0&!2] 0 {0}
[!0] 1 {3} [!0] 1 {2}
[0&1&2] 2 {1} [0&1&2] 2 {1}
[0&!1&2] 2 {2} [0&!1&2] 2 {2}
State: 3 State: 3
...@@ -1042,21 +1042,21 @@ name: "(p0 W XXGp0) & G(Fp1 & FGp2)" ...@@ -1042,21 +1042,21 @@ name: "(p0 W XXGp0) & G(Fp1 & FGp2)"
States: 5 States: 5
Start: 0 Start: 0
AP: 3 "p0" "p1" "p2" AP: 3 "p0" "p1" "p2"
acc-name: parity min odd 4 acc-name: parity min odd 3
Acceptance: 4 Fin(0) & (Inf(1) | (Fin(2) & Inf(3))) Acceptance: 3 Fin(0) & (Inf(1) | Fin(2))
properties: trans-labels explicit-labels trans-acc colored properties: trans-labels explicit-labels trans-acc colored
properties: deterministic properties: deterministic
--BODY-- --BODY--
State: 0 State: 0
[0&!1 | 0&!2] 0 {2} [0&!1 | 0&!2] 0 {2}
[!0] 1 {3} [!0] 1 {2}
[0&1&2] 2 {1} [0&1&2] 2 {1}
State: 1 State: 1
[!1 | !2] 3 {3} [!1 | !2] 3 {2}
[1&2] 4 {3} [1&2] 4 {2}
State: 2 State: 2
[0&!2] 0 {0} [0&!2] 0 {0}
[!0] 1 {3} [!0] 1 {2}
[0&1&2] 2 {1} [0&1&2] 2 {1}
[0&!1&2] 2 {2} [0&!1&2] 2 {2}
State: 3 State: 3
...@@ -1527,7 +1527,6 @@ ltlcross 'ltl2tgba -P' 'ltl2tgba -P"odd max"' 'ltl2tgba -P"even min"' \ ...@@ -1527,7 +1527,6 @@ ltlcross 'ltl2tgba -P' 'ltl2tgba -P"odd max"' 'ltl2tgba -P"even min"' \
'ltl2tgba -p' 'ltl2tgba -p"odd max"' 'ltl2tgba -p"even min"' \ 'ltl2tgba -p' 'ltl2tgba -p"odd max"' 'ltl2tgba -p"even min"' \
-f FGa -f 'GFa&GFb' -f 'GF(a <-> XXXb)' -f '(p0 W XXGp0) & GFp1 & FGp2' -f FGa -f 'GFa&GFb' -f 'GF(a <-> XXXb)' -f '(p0 W XXGp0) & GFp1 & FGp2'
# Test the behavior of our determinization on Max Michel automata. # Test the behavior of our determinization on Max Michel automata.
# Any change to Spot that lowers the output.states is welcome :-) # Any change to Spot that lowers the output.states is welcome :-)
genaut --m-nba=1..4 | autcross --language-preserved 'autfilt -D' --csv=out.csv genaut --m-nba=1..4 | autcross --language-preserved 'autfilt -D' --csv=out.csv
......
...@@ -48,11 +48,11 @@ ...@@ -48,11 +48,11 @@
{ {
"data": { "data": {
"image/svg+xml": [ "image/svg+xml": [
"<svg height=\"165pt\" viewBox=\"0.00 0.00 307.00 164.80\" width=\"307pt\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\">\n", "<svg height=\"165pt\" viewBox=\"0.00 0.00 307.00 164.80\" width=\"307pt\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\">\n",
"<g class=\"graph\" id=\"graph0\" transform=\"scale(1 1) rotate(0) translate(4 160.8)\">\n", "<g class=\"graph\" id=\"graph0\" transform=\"scale(1 1) rotate(0) translate(4 160.8)\">\n",
"<polygon fill=\"#ffffff\" points=\"-4,4 -4,-160.8 303,-160.8 303,4 -4,4\" stroke=\"transparent\"/>\n", "<polygon fill=\"#ffffff\" points=\"-4,4 -4,-160.8 303,-160.8 303,4 -4,4\" stroke=\"transparent\"/>\n",
"<text fill=\"#000000\" font-family=\"Lato\" font-size=\"14.00\" text-anchor=\"start\" x=\"126.5\" y=\"-126.6\">[Büchi]</text>\n", "<text fill=\"#000000\" font-family=\"Lato\" font-size=\"14.00\" text-anchor=\"start\" x=\"126.5\" y=\"-126.6\">[Büchi]</text>\n",
"<!-- I -->\n", "<!-- I -->\n",
"<!-- 2 -->\n", "<!-- 2 -->\n",
"<g class=\"node\" id=\"node2\">\n", "<g class=\"node\" id=\"node2\">\n",
"<title>2</title>\n", "<title>2</title>\n",
...@@ -65,11 +65,11 @@ ...@@ -65,11 +65,11 @@
"<path d=\"M1.1233,-62C4.178,-62 17.9448,-62 30.9241,-62\" fill=\"none\" stroke=\"#000000\"/>\n", "<path d=\"M1.1233,-62C4.178,-62 17.9448,-62 30.9241,-62\" fill=\"none\" stroke=\"#000000\"/>\n",
"<polygon fill=\"#000000\" points=\"37.9807,-62 30.9808,-65.1501 34.4807,-62 30.9807,-62.0001 30.9807,-62.0001 30.9807,-62.0001 34.4807,-62 30.9807,-58.8501 37.9807,-62 37.9807,-62\" stroke=\"#000000\"/>\n", "<polygon fill=\"#000000\" points=\"37.9807,-62 30.9808,-65.1501 34.4807,-62 30.9807,-62.0001 30.9807,-62.0001 30.9807,-62.0001 34.4807,-62 30.9807,-58.8501 37.9807,-62 37.9807,-62\" stroke=\"#000000\"/>\n",
"</g>\n", "</g>\n",
"<!-- 2&#45;&gt;2 -->\n", "<!-- 2&#45;&gt;2 -->\n",
"<g class=\"edge\" id=\"edge7\">\n", "<g class=\"edge\" id=\"edge7\">\n",
   
"<path d=\"M49.6208,-79.0373C48.3189,-88.8579 50.4453,-98 56,-98 60.166,-98 62.4036,-92.8576 62.7128,-86.1433\" fill=\"none\" stroke=\"#000000\"/>\n",