* src/evtgbaalgos/tgba2evtgba.cc, src/evtgbaalgos/tgba2evtgba.hh:

New files.
* src/evtgbaalgos/Makefile.am (evtgbaalgos_HEADERS,
libevtgbaalgos_la_SOURCES): Add them.
* src/evtgbatest/ltl2evtgba.cc, src/evtgbatest/ltl2evtgba.test:
New files.
* src/evtgbatest/Makefile.am (check_PROGRAMS, TESTS): Add them.
(ltl2evtgba_SOURCES): New variable.

src/evtgbaalgos/Makefile.am

@@ -27,10 +27,12 @@ evtgbaalgosdir = $(pkgincludedir)/evtgbaalgos
 evtgbaalgos_HEADERS = \
   dotty.hh \
   reachiter.hh \
-  save.hh
+  save.hh \
+  tgba2evtgba.hh
 
 noinst_LTLIBRARIES = libevtgbaalgos.la
 libevtgbaalgos_la_SOURCES = \
   dotty.cc \
   reachiter.cc \
-  save.cc
+  save.cc \
+  tgba2evtgba.cc

src/evtgbaalgos/tgba2evtgba.cc

@@ -0,0 +1,150 @@
+// Copyright (C) 2004  Laboratoire d'Informatique de Paris 6 (LIP6),
+// département Systèmes Répartis Coopératifs (SRC), Université Pierre
+// et Marie Curie.
+//
+// This file is part of Spot, a model checking library.
+//
+// Spot is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// Spot is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+// or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+// License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Spot; see the file COPYING.  If not, write to the Free
+// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+// 02111-1307, USA.
+
+#include "tgba2evtgba.hh"
+#include "tgba/tgba.hh"
+#include "evtgba/explicit.hh"
+#include "tgbaalgos/reachiter.hh"
+#include "ltlvisit/tostring.hh"
+#include "ltlvisit/destroy.hh"
+
+namespace spot
+{
+  namespace
+  {
+    class tgba_to_evtgba_iter:
+      public tgba_reachable_iterator_depth_first
+    {
+    public:
+      tgba_to_evtgba_iter(const tgba* a)
+	: tgba_reachable_iterator_depth_first(a)
+      {
+	res = new evtgba_explicit;
+      }
+
+      ~tgba_to_evtgba_iter()
+      {
+      }
+
+      virtual void
+      start()
+      {
+	const rsymbol_set ss =
+	  acc_to_symbol_set(automata_->all_acceptance_conditions());
+	for (rsymbol_set::const_iterator i = ss.begin(); i != ss.end(); ++i)
+	  res->declare_acceptance_condition(*i);
+      }
+
+      virtual void
+      process_state(const state* s, int n, tgba_succ_iterator*)
+      {
+	std::string str = this->automata_->format_state(s);
+	name_[n] = str;
+	if (n == 1)
+	  res->set_init_state(str);
+      }
+
+      virtual void
+      process_link(int in, int out, const tgba_succ_iterator* si)
+      {
+	// We might need to format out before process_state is called.
+	name_map_::const_iterator i = name_.find(out);
+	if (i == name_.end())
+	  {
+	    const state* s = si->current_state();
+	    process_state(s, out, 0);
+	    delete s;
+	  }
+
+	rsymbol_set ss = acc_to_symbol_set(si->current_acceptance_conditions());
+
+	bdd all = si->current_condition();
+	while (all != bddfalse)
+	  {
+	    bdd one = bdd_satone(all);
+	    all -= one;
+	    while (one != bddfalse)
+	      {
+		bdd low = bdd_low(one);
+		if (low == bddfalse)
+		  {
+		    const ltl::formula* v =
+		      automata_->get_dict()->var_formula_map[bdd_var(one)];
+		    res->add_transition(name_[in],
+					to_string(v),
+					ss,
+					name_[out]);
+		    break;
+		  }
+		else
+		  {
+		    one = low;
+		  }
+	      }
+	    assert(one != bddfalse);
+	  }
+      }
+
+      evtgba_explicit* res;
+    protected:
+      typedef std::map<int, std::string> name_map_;
+      name_map_ name_;
+
+      rsymbol_set
+      acc_to_symbol_set(bdd acc) const
+      {
+	rsymbol_set ss;
+	while (acc != bddfalse)
+	  {
+	    bdd one = bdd_satone(acc);
+	    acc -= one;
+	    while (one != bddfalse)
+	      {
+		bdd low = bdd_low(one);
+		if (low == bddfalse)
+		  {
+		    const ltl::formula* v =
+		      automata_->get_dict()->acc_formula_map[bdd_var(one)];
+		    ss.insert(rsymbol(to_string(v)));
+		    break;
+		  }
+		else
+		  {
+		    one = low;
+		  }
+	      }
+	    assert(one != bddfalse);
+	  }
+	return ss;
+      }
+
+    };
+
+  } // anonymous
+
+  evtgba_explicit*
+  tgba_to_evtgba(const tgba* a)
+  {
+    tgba_to_evtgba_iter i(a);
+    i.run();
+    return i.res;
+  }
+} // spot

src/evtgbaalgos/tgba2evtgba.hh

@@ -0,0 +1,37 @@
+// Copyright (C) 2004  Laboratoire d'Informatique de Paris 6 (LIP6),
+// département Systèmes Répartis Coopératifs (SRC), Université Pierre
+// et Marie Curie.
+//
+// This file is part of Spot, a model checking library.
+//
+// Spot is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// Spot is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+// or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+// License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Spot; see the file COPYING.  If not, write to the Free
+// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+// 02111-1307, USA.
+
+#ifndef SPOT_EVTGBAALGOS_TGBA2EVTGBA_HH
+# define SPOT_EVTGBAALGOS_TGBA2EVTGBA_HH
+
+namespace spot
+{
+  class tgba;
+  class evtgba_explicit;
+
+  /// \brief Convert a tgba into an evtgba.
+  ///
+  /// (This cannot be done on-the-fly because the alphabet of a tgba
+  /// as unknown beforehand.)
+  evtgba_explicit* tgba_to_evtgba(const tgba* a);
+}
+
+#endif // SPOT_EVTGBAALGOS_TGBA2EVTGBA_HH