Florent D'Halluin authored Apr 09, 2009 and Alexandre Duret-Lutz committed Jun 05, 2009

Note: bencher and global_bencher remain.

4 steps:
1) Remove the timer system.
2) Fix taf-kit.
3) Disable bench in data/automata.
4) Use cbs in algorithms/*.hxx and tools/*.hxx.

Most modifications were only macro renaming.

Tests:
/!\ make check should be done on this patch.
Taf-kit was quickly tested.
make bench was quickly tested as well.

Files patched:

1) Remove the timer system:

* include/vaucanson/misc/global_bencher.hh: New.
Gather bencher-related macros.  Bench using the timer from cbs.
* include/vaucanson/misc/global_timer.hh: Removed.
Remove timer-related macros, put the rest in global_bencher.hh.
* include/vaucanson/misc/usual_macros.hh: Include the proper files.
* include/Makefile.am: Add/remove files.
* include/vaucanson/misc/global_timer.hh,
* include/vaucanson/misc/timer.cc,
* include/vaucanson/misc/timer.hh,
* include/vaucanson/misc/timer.hxx,
* include/vaucanson/misc/timer_internal_gathering.cc,
* include/vaucanson/misc/timer_internal_gathering.hh,
* include/vaucanson/misc/timer_internal_gathering.hxx,
* include/vaucanson/misc/timer_internal_graph.cc,
* include/vaucanson/misc/timer_internal_graph.hh,
* include/vaucanson/misc/timer_internal_graph.hxx: Removed.

2) Fix taf-kit:

* taf-kit/src/common.hh,
* taf-kit/src/main.cc: Remove global_timer. Fix macros.

3) Disable bench in data/automata:

* data/automata/char-b/Makefile.am,
* data/automata/char-fmp-b/Makefile.am,
* data/automata/char-z/Makefile.am:
Set -DBENCH_DISABLED in AM_CPPFLAGS.

4) Use cbs in algorithms/*.hxx and tools/*.hxx:

* include/vaucanson/algorithms/accessible.hxx,
* include/vaucanson/algorithms/aci_canonical.hxx,
* include/vaucanson/algorithms/aut_projection.hxx,
* include/vaucanson/algorithms/aut_to_exp.hxx,
* include/vaucanson/algorithms/berry_sethi.hxx,
* include/vaucanson/algorithms/brzozowski.hxx,
* include/vaucanson/algorithms/complement.hxx,
* include/vaucanson/algorithms/complete.hxx,
* include/vaucanson/algorithms/composition_cover.hxx,
* include/vaucanson/algorithms/concatenate.hxx,
* include/vaucanson/algorithms/cut_up.hxx,
* include/vaucanson/algorithms/derived_term_automaton.hxx,
* include/vaucanson/algorithms/determinize.hxx,
* include/vaucanson/algorithms/domain.hxx,
* include/vaucanson/algorithms/eps_removal.hxx,
* include/vaucanson/algorithms/eps_removal_sp.hxx,
* include/vaucanson/algorithms/eval.hxx,
* include/vaucanson/algorithms/evaluation_fmp.hxx,
* include/vaucanson/algorithms/extension.hxx,
* include/vaucanson/algorithms/finite_support_conversion.hxx,
* include/vaucanson/algorithms/fmp_to_rw.hxx,
* include/vaucanson/algorithms/image.hxx,
* include/vaucanson/algorithms/invert.hxx,
* include/vaucanson/algorithms/is_ambiguous.hxx,
* include/vaucanson/algorithms/is_deterministic.hxx,
* include/vaucanson/algorithms/is_ltl.hxx,
* include/vaucanson/algorithms/is_normalized.hxx,
* include/vaucanson/algorithms/isomorph.hxx,
* include/vaucanson/algorithms/letter_to_letter_composition.h,
* include/vaucanson/algorithms/ltl_to_pair.hxx,
* include/vaucanson/algorithms/minimization_hopcroft.hxx,
* include/vaucanson/algorithms/minimization_moore.hxx,
* include/vaucanson/algorithms/normalized.hxx,
* include/vaucanson/algorithms/pair_to_fmp.hxx,
* include/vaucanson/algorithms/product.hxx,
* include/vaucanson/algorithms/projection.hxx,
* include/vaucanson/algorithms/realtime.hxx,
* include/vaucanson/algorithms/rw_composition.hxx,
* include/vaucanson/algorithms/search.hxx,
* include/vaucanson/algorithms/standard.hxx,
* include/vaucanson/algorithms/sub_automaton.hxx,
* include/vaucanson/algorithms/sub_normalize.hxx,
* include/vaucanson/algorithms/transpose.hxx,
* include/vaucanson/algorithms/trim.hxx,
* include/vaucanson/tools/io.hxx: Replace TIMER_SCOPED with
BENCH_TASK_SCOPED.

Florent D'Halluin authored Apr 06, 2009 and Alexandre Duret-Lutz committed Jun 05, 2009

* vaucanson.mk: Define benchlib.
* lib/generate_libvcsn.rb,
* taf-kit/src/Makefile.am,
* src/bench/generate_bench.sh: Use it.

Florent D'Halluin authored Apr 06, 2009 and Alexandre Duret-Lutz committed Jun 05, 2009

CBS version: e97a404a44e5b5d19d4a869aa1f43524386c5b09.
See cbs/Changelog.

Florent D'Halluin authored Apr 06, 2009 and Alexandre Duret-Lutz committed Jun 05, 2009

* cbs: Add directory.
* configure.ac: Add AC_CONFIG_SUBDIRS for cbs.
* Makefile.am: Add cbs subdir.

* lib/src/libcommon.mk: Do not overwrite AM_CPPFLAGS with a list
of include directories that is less complete than the one in
vaucanson.mk, use...
(libvcsn_common_la_CPPFLAGS, libvcsn_common_ex_la_CPPFLAGS):
... these variable to augmant AM_CPPFLAGS instead.

* configure.ac: Bump version to 1.3.
* doc/manual/taf-kit-manual.tex: Likewise.
* doc/NEWS.txt: Update for 1.3.

* src/tests/check/Makefile.am (libcheck_a_LIBADD): Rename as ...
(libcheck_la_LIBADD): ... this.

* src/demos/demo.mk (LDADD): Define globally.
* src/demos/algorithms/Makefile.am (aut_are_equivalent_LDADD,
exp_are_equivalent_LDADD): Remove.
* src/demos/one_rule_rewriting/Makefile.am (LDADD): Likewise.
* src/demos/vgrep/Makefile.am (LDADD): Likewise.

* include/vaucanson/algebra/implementation/semiring/numerical_semiring.hxx,
include/vaucanson/misc/random.hxx: Use std::abs() instead of abs().
* include/vaucanson/algebra/implementation/semiring/rational_number.hxx:
Likewise, and also include <cstdlib> for abs(int).

to decide whether exceptions should be used in preconditions.

This fixes errors in taf-kit's test-suite when compiled with GCC
4.4.  The code was making the bogus assumption that the inline
function trap() was not inlined in the context libraries (compiled
without exceptions) and could therefore be overwritten as a weak
symbol in TAF-Kit (to use exceptions).

* include/vaucanson/misc/contract.hh (vcsn::misc::contract::trap):
Leave only a declaration and move the definition...
* src/misc/contract.cc: ... in this new file.
* lib/src/libcommon.mk: Adjust for contract.cc and build two
libraries: libvcsn-common.la (with abort()) and
libvcsn-common-ex.la (with exceptions).
* data/automata/char-b/Makefile.am,
data/automata/char-fmp-b/Makefile.am,
data/automata/char-z/Makefile.am, taf-kit/src/Makefile.am,
vaucanswig/meta/Makefile.am, src/tests/sanity/Makefile.am,
src/tests/xml/Makefile.am: Link with libvcsn-common.la or
libvcsn-common-ex.la.
* taf-kit/src/common.hh (EXCEPTION_TRAPS): Remove #define.
* src/bench/common/bench.mk (AM_CPPFLAGS): Remove useless
-DEXCEPTION_TRAPS.
* vaucanswig/expand.sh: Likewise.
* src/tests/check/Makefile.am: Build libcheck.la instead
of libcheck.a, so we can depend on libvcsn-common-ex.la
* src/tests/check/check.mk: Use libcheck.la and
libvcsn-common-ex.la.
* src/tests/test-suites/test-suite.mk: Don't define
EXCEPTION_TRAPS and don't add libvcsn-common-ex.la to LDADD
(check.mk already does it).

to lib/src/krat_exp/, so that we can later integrate more code
into libvcsn_common.la.

* bootstrap: Don't run bison, the Makefile will do it.
* lib/krat_exp/krat_exp_bison.yy: Move ...
* lib/src/krat_exp/krat_exp_bison.yy: ... here.
* lib/krat_exp/libkrat_exp.mk: Rename as ...
* lib/src/libcommon.mk: ... this, and adjust to the new names.
* src/demos/algorithms/Makefile.am,
src/demos/one_rule_rewriting/Makefile.am,
src/demos/vgrep/Makefile.am, src/tests/xml/Makefile.am,
taf-kit/src/Makefile.am, lib/Makefile.am: Change all references to
libkrat_exp.la into libvcsn-common.la.

* include/vaucanson/algebra/implementation/series/transpose.hh:
Do not name a argument T when T is also a template parameter.

* vcs/vaucanson.rb: Remove.

* doc/manual/Makefile.am: Correct the path to taf-kit-manual.tex by
prefixing the old path with $(srcdir).

* include/vaucanson/automata/implementation/bmig/bmig_handlers.hh
(operator==, operator!=, operator<, operator>, operator<=)
(operator>=): Remove the last template parameter.
* include/vaucanson/automata/implementation/bmig/bmig_handlers_op.hxx:
Update the macro HOPERATOR for <, >, <=, >= and the one for ==, !=.

Suggested by Jacques Sakarovitch.

* data/automata/char-z/d2.cc: Rename as...
* data/automata/char-z/d1.cc: ... this.
* data/automata/char-z/Makefile.am: Adjust to build d1 and create
d1.xml
* taf-kit/tests/vcsn-char-z.test: Adjust to use d1.xml.
* doc/manual/taf-kit-manual.tex: Rename d2.xml as d1.xml.

* doc/manual/taf-kit-manual.tex (Writing Rational Expressions):
Rename as ...
(Writing (Weighted) Rational Expressions): ... this.
(Rational operators): Show the result of the are-equivalent
example.
(Weights): Document left and right weights using text from
Jacques Sakarovitch.
(Trivial Identities): Write "weighted rational expression"
instead of "rational expression" to avoid ambiguities.

(As mentioned during the meeting on April 10th)

* include/vaucanson/algorithms/minimization_hopcroft.hxx: Do that.

* doc/manual/taf-kit-manual.tex: Likewise.

* configure.ac: Bump to 1.2.96.
* doc/manual/taf-kit-manual.tex: Likewise.
* doc/NEWS.txt: Document 1.2.96.

Conflicts:
	ChangeLog

* data/automata/char-z/d2.cc: New file.
* data/automata/char-z/Makefile.am: Build d2.xml.
* taf-kit/tests/vcsn-char-z.test: Test d2.xml.
* doc/manual/taf-kit-manual.tex (d2.xml): New section.

* data/automata/char-z/divkbaseb.cc: Delete.
* data/automata/char-z/Makefile.am,
taf-kit/tests/vcsn-char-z.test: Adjust.
* doc/manual/taf-kit-manual.tex (div3base10.xml): Remove.

* data/automata/char-z/c1.cc: Rewrite using alphabet {0,1} instead
of {a,b}.
* taf-kit/tests/vcsn-char-z.test: Adjust test.
* doc/manual/taf-kit-manual.tex (c1.xml): Adjust and document
the figure.

Sakarovitch.

* doc/manual/vaucanson-manual.tex: Rename as ...
* doc/manual/taf-kit-manual.tex: ... this.  And change
the title to "Taf-Kit Documentation"
* doc/manual/Makefile.am, lrde-upload.sh: Adjust.

newline at EOF to kill a GCC warning.

phrases.