autfilt: Better display of cluster when universal edge loops in it

Fixes #208

* NEWS: Informations about the modifications
* spot/twaalgos/dot.cc (print): Gestion of cluster for
universal transitions
* tests/core/alternating.test: tests added
* tests/core/neverclaimread.test: tests changed for
new dot format
* tests/core/readsave.test: tests changed
* tests/core/sccdot.test: tests changed
* tests/python/_altscc.ipynb: tests changed
* tests/python/decompose.ipynb: tests changed

NEWS

@@ -41,6 +41,10 @@ New in spot 2.3.0.dev (not yet released)
     caused any user-defined CPPFLAGS to be ignored while building
     Spot.
 
+  - The display of clusters with universal edges was confused, because the
+    intermediate node was not in the cluster even if one of the target was
+    in the same one.
+
 New in spot 2.3 (2017-01-19)
 
   Build:

spot/twaalgos/dot.cc

@@ -369,7 +369,8 @@ namespace spot
       std::set<std::pair<int, int>> done;
 
       void
-      print_dst(int dst, const char* style = nullptr, int color_num = -1)
+      print_dst(int dst, const char* style = nullptr, int scc_num = -1,
+                int color_num = -1)
       {
         std::ostringstream tmp_dst;
         tmp_dst << dst;
@@ -584,9 +585,14 @@ namespace spot
       }
 
       void
-      process_link(const twa_graph::edge_storage_t& t, int number)
+      process_link(const twa_graph::edge_storage_t& t, int number,
+                   int scc_num = -1)
       {
         os_ << "  " << t.src << " -> " << (int)t.dst;
+        if (scc_num >= 0)
+          {
+            os_ << '.' << scc_num;
+          }
         if (aut_->is_univ_dest(t.dst) && highlight_edges_
             && !opt_shared_univ_dest_)
           {
@@ -659,9 +665,9 @@ namespace spot
         if (aut_->is_univ_dest(t.dst))
           {
             if (color_num >= 0)
-              print_dst(t.dst, highlight.c_str(), color_num);
+              print_dst(t.dst, highlight.c_str(), scc_num, color_num);
             else
-              print_dst(t.dst, highlight.c_str());
+              print_dst(t.dst, highlight.c_str(), scc_num);
           }
       }
 
@@ -764,7 +770,29 @@ namespace spot
                     os_ << "  label=\"\"\n";
                   }
                 for (auto s: si->states_of(i))
-                  process_state(s);
+                  {
+                    process_state(s);
+                    int trans_num = 0;
+                    for (auto& t : aut_->out(s))
+                      {
+                        if (aut_->is_univ_dest(t.dst))
+                          {
+                            bool to_write = false;
+                            for (unsigned d: aut_->univ_dests(t.dst))
+                              {
+                                to_write = si->scc_of(d) == si->scc_of(s);
+                                if (to_write)
+                                    break;
+                              }
+                            if (to_write)
+                              process_link(t, trans_num++, i);
+                            else
+                              process_link(t, trans_num++);
+                          }
+                         else
+                           process_link(t, trans_num++);
+                      }
+                  }
                 os_ << "  }\n";
               }
           }
@@ -772,10 +800,12 @@ namespace spot
         for (unsigned n = 0; n < ns; ++n)
           {
             if (!si || !si->reachable_state(n))
-              process_state(n);
-            int trans_num = 0;
-            for (auto& t: aut_->out(n))
-              process_link(t, trans_num++);
+              {
+                process_state(n);
+                int trans_num = 0;
+                for (auto& t: aut_->out(n))
+                  process_link(t, trans_num++);
+              }
           }
         end();
       }

tests/core/alternating.test

@@ -69,37 +69,49 @@ digraph G {
   color=green
   label=""
   2 [label="G(a)"]
+  2 -> 2 [label="a"]
   }
   subgraph cluster_1 {
   color=red
   label=""
   1 [label="FG(a)\n⓿"]
+  1 -> 2 [label="a"]
+  1 -> 1 [label="1"]
   }
   subgraph cluster_2 {
   color=green
   label=""
   6 [label="t"]
+  6 -> 6 [label="1"]
   }
   subgraph cluster_3 {
   color=red
   label=""
   4 [label="F(b)\n⓿"]
+  4 -> 6 [label="b"]
+  4 -> 4 [label="!b"]
   }
   subgraph cluster_4 {
   color=green
   label=""
   3 [label="GF(b)"]
+  3 -> 3 [label="b"]
+  3 -> -8.4 [label="!b", style=bold, color="#FAA43A", arrowhead=onormal]
+    -8.4 [label=<>,shape=point]
+    -8.4 -> 3 [style=bold, color="#FAA43A"]
+    -8.4 -> 4 [style=bold, color="#FAA43A"]
   }
   subgraph cluster_5 {
   color=red
   label=""
   5 [label="((a) U (b))\n⓿"]
+  5 -> 6 [label="b"]
+  5 -> 5 [label="a & !b"]
   }
   subgraph cluster_6 {
   color=black
   label=""
   0 [label="((((a) U (b)) && GF(b)) && FG(a))"]
-  }
   0 -> -1 [label="b", arrowhead=onormal]
     -1 [label=<>,shape=point]
     -1 -> 1
@@ -109,19 +121,7 @@ digraph G {
     -4 -> 1 [style=bold, color="#F15854"]
     -4 -> 3 [style=bold, color="#F15854"]
     -4 -> 5 [style=bold, color="#F15854"]
-  1 -> 2 [label="a"]
-  1 -> 1 [label="1"]
-  2 -> 2 [label="a"]
-  3 -> 3 [label="b"]
-  3 -> -8 [label="!b", style=bold, color="#FAA43A", arrowhead=onormal]
-    -8 [label=<>,shape=point]
-    -8 -> 3 [style=bold, color="#FAA43A"]
-    -8 -> 4 [style=bold, color="#FAA43A"]
-  4 -> 6 [label="b"]
-  4 -> 4 [label="!b"]
-  5 -> 6 [label="b"]
-  5 -> 5 [label="a & !b"]
-  6 -> 6 [label="1"]
+  }
 }
 EOF
 
@@ -353,7 +353,7 @@ State: 0
 EOF
 diff out5 expect
 
-# Test if split option is correct
+# Test if split option with color is correct
 cat >ex6<<EOF
 HOA: v1.1
 States: 2
@@ -373,6 +373,7 @@ EOF
 
 run 0 autfilt --dot='baryf(Lato)' ex6 > ex6.dot
 
+style='arrowhead=onormal'
 cat >expect6.dot<<EOF
 digraph G {
   rankdir=LR
@@ -389,11 +390,11 @@ digraph G {
     -1 -> 1
   0 [label=<0>]
   0 -> 0 [label=<!a &amp; !c>]
-  0 -> -1.1 [label=<a &amp; b &amp; !c>, style=bold, color="#F17CB0", arrowhead=onormal]
+  0 -> -1.1 [label=<a &amp; b &amp; !c>, style=bold, color="#F17CB0", $style]
     -1.1 [label=<>,shape=point]
     -1.1 -> 0 [style=bold, color="#F17CB0"]
     -1.1 -> 1 [style=bold, color="#F17CB0"]
-  0 -> -1.2 [label=<a &amp; !c>, style=bold, color="#FAA43A", arrowhead=onormal]
+  0 -> -1.2 [label=<a &amp; !c>, style=bold, color="#FAA43A", $style]
     -1.2 [label=<>,shape=point]
     -1.2 -> 0 [style=bold, color="#FAA43A"]
     -1.2 -> 1 [style=bold, color="#FAA43A"]
@@ -690,6 +691,79 @@ EOF
 
 diff ex10.dot expect10.dot
 
+cat >ex11 <<EOF
+HOA: v1
+tool: "LTL3HOA"
+name: "SLAA for G((b & Fa) | (!b & G!a))"
+States: 4
+AP: 2 "b" "a"
+Start: 0
+Acceptance: 1 Fin(0)
+--BODY--
+State: 0 "G((b & Fa) | (!b & G!a))"
+  [(0 & 1)] 0
+  [(0 & !1)] 0&1
+  [(!0 & !1)] 0&2
+State: 1 "Fa"
+  [(1)] 3
+  [(!1)] 1 {1}
+State: 2 "G!a"
+  [(!1)] 2
+State: 3 "t"
+  [t] 3
+--END--
+EOF
+
+run 2 autfilt --dot='sbarf(Lato)' ex11 > ex11.dot
+
+cat >expect11.dot <<EOF
+digraph G {
+  rankdir=LR
+  label=<Fin(<font color="#5DA5DA">⓿</font>)>
+  labelloc="t"
+  fontname="Lato"
+  node [fontname="Lato"]
+  edge [fontname="Lato"]
+  I [label="", style=invis, width=0]
+  I -> 0
+  subgraph cluster_0 {
+  color=green
+  label=""
+  3 [label="t"]
+  3 -> 3 [label=<1>]
+  }
+  subgraph cluster_1 {
+  color=green
+  label=""
+  1 [label="Fa"]
+  1 -> 3 [label=<a>]
+  1 -> 1 [label=<!a>]
+  }
+  subgraph cluster_2 {
+  color=green
+  label=""
+  2 [label="G!a"]
+  2 -> 2 [label=<!a>]
+  }
+  subgraph cluster_3 {
+  color=green
+  label=""
+  0 [label="G((b & Fa) | (!b & G!a))"]
+  0 -> 0 [label=<a &amp; b>]
+  0 -> -1.3 [label=<!a &amp; b>, arrowhead=onormal]
+    -1.3 [label=<>,shape=point]
+    -1.3 -> 0
+    -1.3 -> 1
+  0 -> -4.3 [label=<!a &amp; !b>, arrowhead=onormal]
+    -4.3 [label=<>,shape=point]
+    -4.3 -> 0
+    -4.3 -> 2
+  }
+}
+EOF
+
+diff ex11.dot expect11.dot
+
 # Detect cases where alternation-removal cannot work.
 cat >in <<EOF
 HOA: v1

tests/core/neverclaimread.test

@@ -336,15 +336,15 @@ digraph G {
   color=green
   label=""
   1 [label="1", peripheries=2]
+  1 -> 1 [label="1"]
   }
   subgraph cluster_1 {
   color=red
   label=""
   0 [label="0"]
-  }
   0 -> 1 [label="b"]
   0 -> 0 [label="0"]
-  1 -> 1 [label="1"]
+  }
 }
 EOF
 diff stdout expected

tests/core/readsave.test

@@ -327,21 +327,21 @@ digraph G {
   subgraph cluster_0 {
   color=green
   1 [label="s1", peripheries=2]
+  1 -> 1 [label="a"]
   }
   subgraph cluster_1 {
   color=green
   0 [label="s0", peripheries=2]
+  0 -> 0 [label="b"]
   }
   subgraph cluster_2 {
   color=black
   3 [label="s3"]
+  3 -> 1 [label="a"]
+  3 -> 0 [label="b"]
   }
-  0 -> 0 [label="b"]
-  1 -> 1 [label="a"]
   2 [label="s2"]
   2 -> 0 [label="b"]
-  3 -> 1 [label="a"]
-  3 -> 0 [label="b"]
 }
 EOF
 

tests/core/sccdot.test

@@ -83,67 +83,67 @@ digraph G {
   color=grey
   label=""
   5 [label="5"]
+  5 -> 6 [label="1"]
   6 [label="6"]
+  6 -> 5 [label="1"]
   }
   subgraph cluster_1 {
   color=grey
   label=""
   0 [label="0"]
+  0 -> 0 [label="a & b\n{0,1,2}"]
+  0 -> 0 [label="!a & !b\n{2}"]
+  0 -> 5 [label="a\n{2}"]
   }
   subgraph cluster_2 {
   color=green
   label=""
   9 [label="9"]
+  9 -> 9 [label="!a & b\n{0,2}"]
+  9 -> 10 [label="a & b\n{0,1}"]
   10 [label="10"]
+  10 -> 9 [label="!a & b\n{0,1}"]
+  10 -> 10 [label="a & b\n{0,2}"]
   }
   subgraph cluster_3 {
   color=green
   label=""
   8 [label="8"]
+  8 -> 8 [label="!a & b\n{0,2}"]
+  8 -> 8 [label="a & b\n{0,1}"]
+  8 -> 9 [label="1"]
   }
   subgraph cluster_4 {
   color=green
   label=""
   7 [label="7"]
+  7 -> 7 [label="!a & b\n{0,1}"]
+  7 -> 7 [label="a & b\n{0,2}"]
+  7 -> 8 [label="1"]
   }
   subgraph cluster_5 {
   color=black
   label=""
   2 [label="2"]
+  2 -> 0 [label="a"]
+  2 -> 7 [label="b"]
   }
   subgraph cluster_6 {
   color=red
   label=""
   4 [label="4"]
+  4 -> 4 [label="!b\n{1,2}"]
+  4 -> 2 [label="b"]
   }
   subgraph cluster_7 {
   color=green
   label=""
   1 [label="1"]
-  3 [label="3"]
-  }
-  0 -> 0 [label="a & b\n{0,1,2}"]
-  0 -> 0 [label="!a & !b\n{2}"]
-  0 -> 5 [label="a\n{2}"]
   1 -> 4 [label="b"]
   1 -> 3 [label="a & !b"]
-  2 -> 0 [label="a"]
-  2 -> 7 [label="b"]
+  3 [label="3"]
   3 -> 1 [label="a & b\n{0,1}"]
-  4 -> 4 [label="!b\n{1,2}"]
-  4 -> 2 [label="b"]
-  5 -> 6 [label="1"]
-  6 -> 5 [label="1"]
-  7 -> 7 [label="!a & b\n{0,1}"]
-  7 -> 7 [label="a & b\n{0,2}"]
-  7 -> 8 [label="1"]
-  8 -> 8 [label="!a & b\n{0,2}"]
-  8 -> 8 [label="a & b\n{0,1}"]
-  8 -> 9 [label="1"]
-  9 -> 9 [label="!a & b\n{0,2}"]
-  9 -> 10 [label="a & b\n{0,1}"]
-  10 -> 9 [label="!a & b\n{0,1}"]
-  10 -> 10 [label="a & b\n{0,2}"]
+  }
 }
 EOF