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

Merge branch 'exp/listg-default' into next

Conflicts:
	ChangeLog
parents e0bde744 fa41eeb8
2009-07-01 Alexandre Duret-Lutz <adl@lrde.epita.fr>
Fix standard_of() w.r.t. listg.
* include/vaucanson/algorithms/standard_of.hxx
(Standard_OfVisitor): After concatenating to automata, and before
erasing the obsolete initial state of the RHS, do not explicitly
erase the transition leaving that initial state. This is useless
because del_state() already does the work. This was bogus because
del_transition invalidates the delta_iterator in the listg
implementation.
* include/vaucanson/algorithms/standard.hxx: Typos.
2009-06-05 Alexandre Duret-Lutz <adl@lrde.epita.fr>
Make listg the default graph implementation, since we now know
that bmig is slower.
* configure.ac (ac_default_graph_impl): Make listg the default.
* doc/README.txt: Adjust documentation of --default-graph-impl.
2009-06-19 d-halluin <d-halluin@lrde.epita.fr>
 
Add benchmark for product.
......
......@@ -27,10 +27,10 @@ AC_CONFIG_SUBDIRS([cbs])
# Check the default graph implementation near the top, this way we can
# quickly react to incorrect values.
ac_default_graph_impl=bmig
ac_default_graph_impl=listg
AC_ARG_WITH([default-graph-impl],
[AC_HELP_STRING([--with-default-graph-impl@<:@=IMPL@:>@],
[choose default graph implementation: bmig (default) or listg])],
[choose default graph implementation: listg (default) or bmig])],
[ac_default_graph_impl="$withval"],[])
AC_DEFINE_UNQUOTED([VCSN_DEFAULT_GRAPH_IMPL], [$ac_default_graph_impl],
......
......@@ -98,9 +98,9 @@ To specify a special path for the Boost-C++ library::
Vaucanson can use two graph implementations: ``listg`` is a
representation based on adjacency lists, while ``bmig`` is a
representation using Boost Multi-Index containers. The default
implementation is ``bmig`` and you can select the other with::
implementation is ``listg`` and you can select the other with::
./configure --default-graph-impl=listg
./configure --default-graph-impl=bmig
For further configure options, type::
......
......@@ -277,7 +277,7 @@ namespace vcsn {
}
// Group the common part of the concat of standard automata algorithm.
// - 'lhs' and 'rhs' are the to automaton to concatanate.
// - 'lhs' and 'rhs' are the two automata to concatanate.
// - 'rhs_i' is the initial state of rhs.
// - 'lhs_final_*' are respectively the begin and end iterator of the set
// containing the final states of lhs.
......
......@@ -119,12 +119,7 @@ namespace vcsn {
lhs_finals.end(),
identity_);
// Clean the automata from rhs_ini and its transitions.
for (typename automaton_t::delta_iterator i(auto_->value(), initial_);
! i.done();
i.next())
auto_->del_transition(*i);
// Remove the obsolete initial state of rhs
auto_->del_state(initial_);
initial_ = lhs_i;
return auto_;
......
Supports Markdown
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