From 0cf952e793acd8a3387793ba76a37c53e66e51cf Mon Sep 17 00:00:00 2001
From: Alexandre Duret-Lutz <adl@lrde.epita.fr>
Date: Thu, 4 Jun 2015 20:51:03 +0200
Subject: [PATCH] stutter bench: fix so that is compile again

* bench/stutter/stutter_invariance_formulas.cc,
bench/stutter/stutter_invariance_randomgraph.cc: Adjust after the
tgba->twa changes.
---
 bench/stutter/stutter_invariance_formulas.cc  | 18 +++++++--------
 .../stutter/stutter_invariance_randomgraph.cc | 23 +++++++++----------
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/bench/stutter/stutter_invariance_formulas.cc b/bench/stutter/stutter_invariance_formulas.cc
index a84dd7b39..1d555813d 100644
--- a/bench/stutter/stutter_invariance_formulas.cc
+++ b/bench/stutter/stutter_invariance_formulas.cc
@@ -21,10 +21,10 @@
 #include "bin/common_setup.hh"
 #include "bin/common_finput.hh"
 #include "bin/common_output.hh"
-#include "tgbaalgos/translate.hh"
-#include "tgbaalgos/stutter.hh"
-#include "tgbaalgos/dupexp.hh"
-#include "tgbaalgos/stats.hh"
+#include "twaalgos/translate.hh"
+#include "twaalgos/stutter.hh"
+#include "twaalgos/dupexp.hh"
+#include "twaalgos/stats.hh"
 #include "ltlast/allnodes.hh"
 #include "ltlvisit/apcollect.hh"
 #include "ltlvisit/length.hh"
@@ -70,8 +70,8 @@ namespace
       const spot::ltl::formula* nf =
 	spot::ltl::unop::instance(spot::ltl::unop::Not,
 				  f->clone());
-      spot::tgba_digraph_ptr a = trans.run(f);
-      spot::tgba_digraph_ptr na = trans.run(nf);
+      spot::twa_graph_ptr a = trans.run(f);
+      spot::twa_graph_ptr na = trans.run(nf);
       spot::ltl::atomic_prop_set* ap = spot::ltl::atomic_prop_collect(f);
       bdd apdict = spot::ltl::atomic_prop_collect_as_bdd(f, a);
 
@@ -82,10 +82,8 @@ namespace
       bool prev = true;
       for (int algo = 1; algo <= 8; ++algo)
         {
-          auto dup_a = spot::make_tgba_digraph(a,
-					       spot::tgba::prop_set::all());
-          auto dup_na = spot::make_tgba_digraph(na,
-						spot::tgba::prop_set::all());
+          auto dup_a = spot::make_twa_graph(a, spot::twa::prop_set::all());
+          auto dup_na = spot::make_twa_graph(na, spot::twa::prop_set::all());
 
           spot::stopwatch sw;
           sw.start();
diff --git a/bench/stutter/stutter_invariance_randomgraph.cc b/bench/stutter/stutter_invariance_randomgraph.cc
index cda96ed29..df80543cf 100644
--- a/bench/stutter/stutter_invariance_randomgraph.cc
+++ b/bench/stutter/stutter_invariance_randomgraph.cc
@@ -19,13 +19,13 @@
 
 #include "misc/timer.hh"
 #include "ltlvisit/apcollect.hh"
-#include "tgbaalgos/dtgbacomp.hh"
-#include "tgbaalgos/randomgraph.hh"
-#include "tgbaalgos/dotty.hh"
-#include "tgbaalgos/product.hh"
-#include "tgbaalgos/stutter.hh"
-#include "tgbaalgos/stats.hh"
-#include "twa/tgbagraph.hh"
+#include "twaalgos/dtgbacomp.hh"
+#include "twaalgos/randomgraph.hh"
+#include "twaalgos/dotty.hh"
+#include "twaalgos/product.hh"
+#include "twaalgos/stutter.hh"
+#include "twaalgos/stats.hh"
+#include "twa/twagraph.hh"
 #include "twa/bdddict.hh"
 #include "misc/random.hh"
 #include <cstdio>
@@ -72,7 +72,7 @@ main(int argc, char** argv)
       // generate n random automata
       for (unsigned i = 0; i < n; ++i)
 	{
-	  spot::tgba_digraph_ptr a;
+	  spot::twa_graph_ptr a;
 	  do
 	    {
 	      spot::srand(++seed);
@@ -93,10 +93,9 @@ main(int argc, char** argv)
 	      if (disable_algo[algo - 1])
 		continue;
 
-	      auto dup_a = spot::make_tgba_digraph(a,
-						   spot::tgba::prop_set::all());
-	      auto dup_na = spot::make_tgba_digraph(na,
-						    spot::tgba::prop_set::all());
+	      auto dup_a = spot::make_twa_graph(a, spot::twa::prop_set::all());
+	      auto dup_na = spot::make_twa_graph(na,
+						 spot::twa::prop_set::all());
 
 	      spot::stopwatch sw;
 	      sw.start();