- Olena-patches

last-svn-commit-135-g153c751 Catch up with the new interface of Scribo's unit tests generator.
by Roland Levillain 21 Apr '10

21 Apr '10

* bootstrap: Here. --- ChangeLog | 6 ++++++ bootstrap | 5 ++++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index b35c785..f4a90d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-04-21 Roland Levillain <roland(a)lrde.epita.fr> + + Catch up with the new interface of Scribo's unit tests generator. + + * bootstrap: Here. + 2010-04-20 Roland Levillain <roland(a)lrde.epita.fr> Move a test from Scribo into Milena. diff --git a/bootstrap b/bootstrap index 9b7a925..a9decca 100755 --- a/bootstrap +++ b/bootstrap @@ -220,7 +220,10 @@ fi run . ./build-aux/build_unit_test.sh `pwd`/milena/mln milena/tests/unit_test milena/tests/unit_test/disabled_tests # Generate unit test files for Scribo. -run scribo/tests/unit_test ./build_unit_test.sh `pwd`/scribo . +run . scribo/tests/unit_test/build_unit_test.sh \ + scribo \ + scribo/tests/unit_test \ + scribo/tests/unit_test/disabled_tests # Install the GNU Build System. autoreconf -f -v -i -- 1.5.6.5

1 0

branch fix-tests updated: last-svn-commit-133-g6dd7d24
by git＠lrde.epita.fr 20 Apr '10

20 Apr '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch fix-tests has been updated discards 0df20ed50b4b8f46a13014348b9f76677cb10e13 (commit) via 6dd7d249daae01e8ed82f836aa2f88c4a5833d8e (commit) via 68b860f7623d03ea9815fd652300bee661351bdc (commit) via 1441b0f7b0a2ec10f6009d8ca9e97f2c6c64decd (commit) via 7c82d9a99dfcdb3c3d9a0e4beb9269ec966fa3aa (commit) via d0cba60a39189a796f76cef7ed7e0ae53ce637a8 (commit) via b77547a34bcd0b5c26ff733de1347334d89b2496 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (0df20ed50b4b8f46a13014348b9f76677cb10e13) \ N -- N -- N (6dd7d249daae01e8ed82f836aa2f88c4a5833d8e) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 6dd7d24 Fix accu::compute(const Meta_Accumulator<A>, const Image<I>&). ----------------------------------------------------------------------- Summary of changes: ChangeLog | 13 +++++++++++++ bootstrap | 10 +++++----- milena/ChangeLog | 23 +++++++++++++++++++++++ milena/mesh/Makefile.am | 2 +- milena/mln/core/image/imorph/labeled_image.hh | 4 +++- milena/mln/io/fld/save.hh | 10 ++++++---- milena/mln/io/fld/write_header.hh | 16 ++++++++-------- milena/tests/util/Makefile.am | 2 ++ scribo/test.cc => milena/tests/util/ord.cc | 4 +--- 9 files changed, 62 insertions(+), 22 deletions(-) rename scribo/test.cc => milena/tests/util/ord.cc (95%) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch next updated: last-svn-commit-132-g68b860f
by git＠lrde.epita.fr 20 Apr '10

20 Apr '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch next has been updated via 68b860f7623d03ea9815fd652300bee661351bdc (commit) via 1441b0f7b0a2ec10f6009d8ca9e97f2c6c64decd (commit) via 7c82d9a99dfcdb3c3d9a0e4beb9269ec966fa3aa (commit) via d0cba60a39189a796f76cef7ed7e0ae53ce637a8 (commit) via b77547a34bcd0b5c26ff733de1347334d89b2496 (commit) from 25eb4fe6f1b8d6217dcfded1ba138b1abb0e4b07 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 68b860f Exercise mln::util::ord. 1441b0f Move a test from Scribo into Milena. 7c82d9a Fix more tests. d0cba60 Install meshes in $(pkgdatadir)/meshes. b77547a Unconditionally regen files not recorded in the repository. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 13 +++++++++++++ bootstrap | 10 +++++----- milena/ChangeLog | 23 +++++++++++++++++++++++ milena/mesh/Makefile.am | 2 +- milena/mln/core/image/imorph/labeled_image.hh | 4 +++- milena/mln/io/fld/save.hh | 10 ++++++---- milena/mln/io/fld/write_header.hh | 16 ++++++++-------- milena/tests/util/Makefile.am | 2 ++ scribo/test.cc => milena/tests/util/ord.cc | 4 +--- 9 files changed, 62 insertions(+), 22 deletions(-) rename scribo/test.cc => milena/tests/util/ord.cc (95%) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-132-g68b860f Exercise mln::util::ord.
by Roland Levillain 20 Apr '10

20 Apr '10

* tests/util/Makefile.am (check_PROGRAMS): Add ord. (ord_SOURCES): New. --- milena/ChangeLog | 7 +++++++ milena/tests/util/Makefile.am | 2 ++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 543b179..374c8d9 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2010-04-20 Roland Levillain <roland(a)lrde.epita.fr> + Exercise mln::util::ord. + + * tests/util/Makefile.am (check_PROGRAMS): Add ord. + (ord_SOURCES): New. + +2010-04-20 Roland Levillain <roland(a)lrde.epita.fr> + Fix more tests. * mln/core/image/imorph/labeled_image.hh: Include diff --git a/milena/tests/util/Makefile.am b/milena/tests/util/Makefile.am index 5ae8e96..07a3f94 100644 --- a/milena/tests/util/Makefile.am +++ b/milena/tests/util/Makefile.am @@ -30,6 +30,7 @@ check_PROGRAMS = \ lazy_set \ lemmings \ line_graph \ + ord \ ord_pair \ set \ soft_heap \ @@ -46,6 +47,7 @@ graph_SOURCES = graph.cc lazy_set_SOURCES = lazy_set.cc lemmings_SOURCES = lemmings.cc line_graph_SOURCES = line_graph.cc +ord_SOURCES = ord.cc ord_pair_SOURCES = ord_pair.cc set_SOURCES = set.cc soft_heap_SOURCES = soft_heap.cc -- 1.5.6.5

1 0

last-svn-commit-131-g1441b0f Move a test from Scribo into Milena.
by Roland Levillain 20 Apr '10

20 Apr '10

* scribo/test.cc: Move... * milena/tests/util/ord.cc: ...here. --- ChangeLog | 7 +++++++ scribo/test.cc => milena/tests/util/ord.cc | 4 +--- 2 files changed, 8 insertions(+), 3 deletions(-) rename scribo/test.cc => milena/tests/util/ord.cc (95%) diff --git a/ChangeLog b/ChangeLog index cf24349..b35c785 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2010-04-20 Roland Levillain <roland(a)lrde.epita.fr> + Move a test from Scribo into Milena. + + * scribo/test.cc: Move... + * milena/tests/util/ord.cc: ...here. + +2010-04-20 Roland Levillain <roland(a)lrde.epita.fr> + Unconditionally regen files not recorded in the repository. * bootstrap: Here. diff --git a/scribo/test.cc b/milena/tests/util/ord.cc similarity index 95% rename from scribo/test.cc rename to milena/tests/util/ord.cc index 462d9b5..44a40d6 100644 --- a/scribo/test.cc +++ b/milena/tests/util/ord.cc @@ -1,5 +1,4 @@ -// Copyright (C) 2009 - EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -31,7 +30,6 @@ int main() { using namespace mln; - point2d p1(0, 2); point2d p2(0, 2); -- 1.5.6.5

1 0

last-svn-commit-130-g7c82d9a Fix more tests.
by Roland Levillain 20 Apr '10

20 Apr '10

* mln/core/image/imorph/labeled_image.hh: Include mln/data/compute.hh. * mln/io/fld/save.hh: Fix headers' inclusions. * mln/io/fld/write_header.hh: Likewise. Add missing namespace qualifiers. --- milena/ChangeLog | 10 ++++++++++ milena/mln/core/image/imorph/labeled_image.hh | 4 +++- milena/mln/io/fld/save.hh | 10 ++++++---- milena/mln/io/fld/write_header.hh | 16 ++++++++-------- 4 files changed, 27 insertions(+), 13 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f8e7e2f..543b179 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2010-04-20 Roland Levillain <roland(a)lrde.epita.fr> + Fix more tests. + + * mln/core/image/imorph/labeled_image.hh: Include + mln/data/compute.hh. + * mln/io/fld/save.hh: Fix headers' inclusions. + * mln/io/fld/write_header.hh: Likewise. + Add missing namespace qualifiers. + +2010-04-20 Roland Levillain <roland(a)lrde.epita.fr> + Install meshes in $(pkgdatadir)/meshes. * mesh/Makefile.am (meshdir): Here. diff --git a/milena/mln/core/image/imorph/labeled_image.hh b/milena/mln/core/image/imorph/labeled_image.hh index 438f6ae..e53da02 100644 --- a/milena/mln/core/image/imorph/labeled_image.hh +++ b/milena/mln/core/image/imorph/labeled_image.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -40,6 +40,8 @@ # include <mln/accu/shape/bbox.hh> # include <mln/accu/stat/max.hh> +# include <mln/data/compute.hh> + # include <mln/labeling/compute.hh> namespace mln diff --git a/milena/mln/io/fld/save.hh b/milena/mln/io/fld/save.hh index bc9afdd..a834dcd 100644 --- a/milena/mln/io/fld/save.hh +++ b/milena/mln/io/fld/save.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -25,11 +26,14 @@ #ifndef MLN_IO_FLD_SAVE_HH # define MLN_IO_FLD_SAVE_HH + /// \file /// \brief Save an image to AVS field file format. /// /// \todo Handle not high speed images. +# include <fstream> + # include <mln/core/concept/image.hh> # include <mln/core/concept/gpoint.hh> # include <mln/io/fld/header.hh> @@ -38,9 +42,7 @@ # include <mln/algebra/vec.hh> -# include <mln/geom/nsites.hh> -# include <fstream> -# include <iostream> +# include <mln/geom/bbox.hh> namespace mln { diff --git a/milena/mln/io/fld/write_header.hh b/milena/mln/io/fld/write_header.hh index 326c68b..c803528 100644 --- a/milena/mln/io/fld/write_header.hh +++ b/milena/mln/io/fld/write_header.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -26,16 +27,15 @@ #ifndef MLN_IO_FLD_WRITE_HEADER_HH # define MLN_IO_FLD_WRITE_HEADER_HH -/// +/// \file /// \brief Write AVS headers in a file. -/// -/// -/// +# include <cstdlib> -# include <mln/io/fld/header.hh> # include <iostream> +# include <mln/io/fld/header.hh> + namespace mln { @@ -86,7 +86,7 @@ namespace mln break; default: std::cerr << "Data type not supported: abort()."; - abort(); + std::abort(); } switch (h.field) @@ -102,7 +102,7 @@ namespace mln break; default: std::cerr << "Field type not suported: abort()."; - abort(); + std::abort(); } file << "min_ext="; -- 1.5.6.5

1 0

last-svn-commit-129-gd0cba60 Install meshes in $(pkgdatadir)/meshes.
by Roland Levillain 20 Apr '10

20 Apr '10

* mesh/Makefile.am (meshdir): Here. --- milena/ChangeLog | 6 ++++++ milena/mesh/Makefile.am | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 74bb42d..f8e7e2f 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,9 @@ +2010-04-20 Roland Levillain <roland(a)lrde.epita.fr> + + Install meshes in $(pkgdatadir)/meshes. + + * mesh/Makefile.am (meshdir): Here. + 2010-04-09 Roland Levillain <roland(a)lrde.epita.fr> Fix test core/other/box_runend_piter. diff --git a/milena/mesh/Makefile.am b/milena/mesh/Makefile.am index 558d28f..ad91888 100644 --- a/milena/mesh/Makefile.am +++ b/milena/mesh/Makefile.am @@ -21,7 +21,7 @@ ## patsubst). We might want to turn it into something more portable ## when Olena is released. -meshdir = $(pkgdatadir)/images +meshdir = $(pkgdatadir)/meshes dist_mesh_DATA = ## -------- ## -- 1.5.6.5

1 0

last-svn-commit-128-gb77547a Unconditionally regen files not recorded in the repository.
by Roland Levillain 20 Apr '10

20 Apr '10

* bootstrap: Here. --- ChangeLog | 6 ++++++ bootstrap | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index f19f672..cf24349 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-04-20 Roland Levillain <roland(a)lrde.epita.fr> + + Unconditionally regen files not recorded in the repository. + + * bootstrap: Here. + 2010-04-09 Roland Levillain <roland(a)lrde.epita.fr> * configure.ac: Add option `--enable-scribo'. diff --git a/bootstrap b/bootstrap index 1505aa5..9b7a925 100755 --- a/bootstrap +++ b/bootstrap @@ -214,13 +214,13 @@ if $regen_p; then mv -f split-outputs.mk.tmp split-outputs.mk chmod -w split-outputs.mk ) +fi - # Generate unit test files. - run . ./build-aux/build_unit_test.sh `pwd`/milena/mln milena/tests/unit_test milena/tests/unit_test/disabled_tests +# Generate unit test files. +run . ./build-aux/build_unit_test.sh `pwd`/milena/mln milena/tests/unit_test milena/tests/unit_test/disabled_tests - # Generate unit test files for Scribo. - run scribo/tests/unit_test ./build_unit_test.sh `pwd`/scribo . -fi +# Generate unit test files for Scribo. +run scribo/tests/unit_test ./build_unit_test.sh `pwd`/scribo . # Install the GNU Build System. autoreconf -f -v -i -- 1.5.6.5

1 0

branch next updated: last-svn-commit-127-g25eb4fe
by git＠lrde.epita.fr 13 Apr '10

13 Apr '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch next has been updated via 25eb4fe6f1b8d6217dcfded1ba138b1abb0e4b07 (commit) from 77c420e02087c7499fa59caaa8c2c6cf8b27e84c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- No new revisions were added by this update. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 6 ++++++ milena/tests/core/other/box_runend_piter.cc | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch fix-tests created: last-svn-commit-128-g0df20ed
by git＠lrde.epita.fr 13 Apr '10

13 Apr '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch fix-tests has been created at 0df20ed50b4b8f46a13014348b9f76677cb10e13 (commit) - Log ----------------------------------------------------------------- 0df20ed Fix accu::compute(const Meta_Accumulator<A>, const Image<I>&). 25eb4fe Fix test core/other/box_runend_piter. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0