May 2009 - Olena-patches

3918: Set few tests as XFAIL tests.
by Guillaume Lazzara 29 May '09

29 May '09

* tests/convert/Makefile.am, * tests/fun/v2v/Makefile.am, * tests/io/magick/Makefile.am: set three tests as xfail tests. --- milena/ChangeLog | 8 ++++++++ milena/tests/convert/Makefile.am | 2 ++ milena/tests/fun/v2v/Makefile.am | 2 ++ milena/tests/io/magick/Makefile.am | 2 ++ 4 files changed, 14 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 3341339..c3d3344 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2009-05-28 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Set few tests as XFAIL tests. + + * tests/convert/Makefile.am, + * tests/fun/v2v/Makefile.am, + * tests/io/magick/Makefile.am: set three tests as xfail tests. + +2009-05-28 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Do not use essential/2d.hh in doc samples anymore. * doc/examples/accu-right-instanciation.cc, diff --git a/milena/tests/convert/Makefile.am b/milena/tests/convert/Makefile.am index ffab9fa..f673462 100644 --- a/milena/tests/convert/Makefile.am +++ b/milena/tests/convert/Makefile.am @@ -21,3 +21,5 @@ to_rgb_SOURCES = to_rgb.cc to_window_SOURCES = to_window.cc TESTS = $(check_PROGRAMS) + +XFAIL_TESTS = to_hsl diff --git a/milena/tests/fun/v2v/Makefile.am b/milena/tests/fun/v2v/Makefile.am index a01be1c..564bec4 100644 --- a/milena/tests/fun/v2v/Makefile.am +++ b/milena/tests/fun/v2v/Makefile.am @@ -16,3 +16,5 @@ hsl_to_rgb_SOURCES = hsl_to_rgb.cc wrap_SOURCES = wrap.cc TESTS = $(check_PROGRAMS) + +XFAIL_TESTS = hsl_to_rgb diff --git a/milena/tests/io/magick/Makefile.am b/milena/tests/io/magick/Makefile.am index 20fe5ef..c636677 100644 --- a/milena/tests/io/magick/Makefile.am +++ b/milena/tests/io/magick/Makefile.am @@ -14,3 +14,5 @@ load_SOURCES = load.cc save_SOURCES = save.cc TESTS = $(check_PROGRAMS) + +XFAIL_TESTS = save -- 1.5.6.5

1 0

3917: Do not use essential/2d.hh in doc samples anymore.
by Guillaume Lazzara 29 May '09

29 May '09

* doc/examples/accu-right-instanciation.cc, * doc/examples/borderthickness.cc, * doc/examples/box2d-bbox.cc, * doc/examples/domain-display.cc, * doc/examples/dpoint-1.cc, * doc/examples/estim-sites.cc, * doc/examples/extend.cc, * doc/examples/extension-ignore.cc, * doc/examples/fill-call-1.cc, * doc/examples/fill-part-image.cc, * doc/examples/fill-subdomain-shorter.cc, * doc/examples/fill-subdomain.cc, * doc/examples/fill-subimage-cfun.cc, * doc/examples/fill.cc, * doc/examples/forall-piter.cc, * doc/examples/fun-p2v-1.cc, * doc/examples/graph-data.cc, * doc/examples/graph-iter.cc, * doc/examples/ima-has.cc, * doc/examples/ima-load.cc, * doc/examples/ima-save.cc, * doc/examples/ima-size.cc, * doc/examples/ima2d-1.cc, * doc/examples/ima2d-2.cc, * doc/examples/ima2d-4.cc, * doc/examples/ima2d-5.cc, * doc/examples/ima2d-6-clone.cc, * doc/examples/ima2d-7.cc, * doc/examples/ima2d-rot.cc, * doc/examples/labeling-compute.cc, * doc/examples/logical-not.cc, * doc/examples/mln_var.cc, * doc/examples/parray-append.cc, * doc/examples/parray-bbox.cc, * doc/examples/paste-call-1.cc, * doc/examples/paste.cc, * doc/examples/point-1.cc, * doc/examples/predicate-1.cc, * doc/examples/tuto2_first_image.cc, * doc/examples/tuto3/first_routine.cc, * doc/examples/tuto3_rw_image.cc, * doc/examples/tuto4_genericity_and_algorithms.cc, * doc/examples/win-create-1.cc, * doc/examples/win-create-2.cc: replace essential/2d.hh by the proper includes. --- milena/ChangeLog | 50 ++++++++++++++++++++ milena/doc/examples/accu-right-instanciation.cc | 9 +++- milena/doc/examples/borderthickness.cc | 7 ++- milena/doc/examples/box2d-bbox.cc | 2 +- milena/doc/examples/domain-display.cc | 2 +- milena/doc/examples/dpoint-1.cc | 3 +- milena/doc/examples/estim-sites.cc | 3 +- milena/doc/examples/extend.cc | 13 +++++- milena/doc/examples/extension-ignore.cc | 3 +- milena/doc/examples/fill-call-1.cc | 5 ++- milena/doc/examples/fill-part-image.cc | 14 +++++- milena/doc/examples/fill-subdomain-shorter.cc | 18 +++++++- milena/doc/examples/fill-subdomain.cc | 20 +++++++- milena/doc/examples/fill-subimage-cfun.cc | 13 +++++- milena/doc/examples/fill.cc | 8 +++- milena/doc/examples/forall-piter.cc | 3 +- milena/doc/examples/fun-p2v-1.cc | 2 +- milena/doc/examples/graph-data.cc | 11 ++++- milena/doc/examples/graph-iter.cc | 5 ++- milena/doc/examples/ima-has.cc | 2 +- milena/doc/examples/ima-load.cc | 3 +- milena/doc/examples/ima-save.cc | 4 +- milena/doc/examples/ima-size.cc | 3 +- milena/doc/examples/ima2d-1.cc | 2 +- milena/doc/examples/ima2d-2.cc | 3 +- milena/doc/examples/ima2d-4.cc | 2 +- milena/doc/examples/ima2d-5.cc | 2 +- milena/doc/examples/ima2d-6-clone.cc | 3 +- milena/doc/examples/ima2d-7.cc | 4 +- milena/doc/examples/ima2d-rot.cc | 21 ++++++++- milena/doc/examples/labeling-compute.cc | 17 ++++++- milena/doc/examples/logical-not.cc | 7 ++- milena/doc/examples/mln_var.cc | 4 +- milena/doc/examples/parray-append.cc | 3 +- milena/doc/examples/parray-bbox.cc | 5 ++- milena/doc/examples/paste-call-1.cc | 10 ++++- milena/doc/examples/paste.cc | 2 +- milena/doc/examples/point-1.cc | 4 +- milena/doc/examples/predicate-1.cc | 2 +- milena/doc/examples/tuto2_first_image.cc | 5 ++- milena/doc/examples/tuto3/first_routine.cc | 25 +++++++++- milena/doc/examples/tuto3_rw_image.cc | 10 ++++- .../examples/tuto4_genericity_and_algorithms.cc | 34 +++++++++++++- milena/doc/examples/win-create-1.cc | 2 +- milena/doc/examples/win-create-2.cc | 4 +- 45 files changed, 327 insertions(+), 47 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 33aa88c..3341339 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,55 @@ 2009-05-28 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Do not use essential/2d.hh in doc samples anymore. + + * doc/examples/accu-right-instanciation.cc, + * doc/examples/borderthickness.cc, + * doc/examples/box2d-bbox.cc, + * doc/examples/domain-display.cc, + * doc/examples/dpoint-1.cc, + * doc/examples/estim-sites.cc, + * doc/examples/extend.cc, + * doc/examples/extension-ignore.cc, + * doc/examples/fill-call-1.cc, + * doc/examples/fill-part-image.cc, + * doc/examples/fill-subdomain-shorter.cc, + * doc/examples/fill-subdomain.cc, + * doc/examples/fill-subimage-cfun.cc, + * doc/examples/fill.cc, + * doc/examples/forall-piter.cc, + * doc/examples/fun-p2v-1.cc, + * doc/examples/graph-data.cc, + * doc/examples/graph-iter.cc, + * doc/examples/ima-has.cc, + * doc/examples/ima-load.cc, + * doc/examples/ima-save.cc, + * doc/examples/ima-size.cc, + * doc/examples/ima2d-1.cc, + * doc/examples/ima2d-2.cc, + * doc/examples/ima2d-4.cc, + * doc/examples/ima2d-5.cc, + * doc/examples/ima2d-6-clone.cc, + * doc/examples/ima2d-7.cc, + * doc/examples/ima2d-rot.cc, + * doc/examples/labeling-compute.cc, + * doc/examples/logical-not.cc, + * doc/examples/mln_var.cc, + * doc/examples/parray-append.cc, + * doc/examples/parray-bbox.cc, + * doc/examples/paste-call-1.cc, + * doc/examples/paste.cc, + * doc/examples/point-1.cc, + * doc/examples/predicate-1.cc, + * doc/examples/tuto2_first_image.cc, + * doc/examples/tuto3/first_routine.cc, + * doc/examples/tuto3_rw_image.cc, + * doc/examples/tuto4_genericity_and_algorithms.cc, + * doc/examples/win-create-1.cc, + * doc/examples/win-create-2.cc: replace essential/2d.hh by the proper + includes. + +2009-05-28 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Improve global_vars test. * tests/global_vars1.cc, diff --git a/milena/doc/examples/accu-right-instanciation.cc b/milena/doc/examples/accu-right-instanciation.cc index 4e1d180..01bded3 100644 --- a/milena/doc/examples/accu-right-instanciation.cc +++ b/milena/doc/examples/accu-right-instanciation.cc @@ -1,4 +1,11 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> + +#include <mln/value/int_u8.hh> + +#include <mln/level/compute.hh> + +#include <mln/accu/max.hh> + int main() { using namespace mln; diff --git a/milena/doc/examples/borderthickness.cc b/milena/doc/examples/borderthickness.cc index ce02abe..fc571a2 100644 --- a/milena/doc/examples/borderthickness.cc +++ b/milena/doc/examples/borderthickness.cc @@ -1,4 +1,9 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/border/fill.hh> +#include <mln/make/image.hh> +#include <mln/debug/println_with_border.hh> +#include <mln/border/thickness.hh> + int main() { using namespace mln; diff --git a/milena/doc/examples/box2d-bbox.cc b/milena/doc/examples/box2d-bbox.cc index b4bb22a..7707514 100644 --- a/milena/doc/examples/box2d-bbox.cc +++ b/milena/doc/examples/box2d-bbox.cc @@ -1,4 +1,4 @@ -#include<mln/essential/2d.hh> +#include <mln/core/alias/box2d.hh> int main() { using namespace mln; diff --git a/milena/doc/examples/domain-display.cc b/milena/doc/examples/domain-display.cc index d11101f..d3845f2 100644 --- a/milena/doc/examples/domain-display.cc +++ b/milena/doc/examples/domain-display.cc @@ -1,4 +1,4 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> int main() { using namespace mln; diff --git a/milena/doc/examples/dpoint-1.cc b/milena/doc/examples/dpoint-1.cc index 5ad29e6..a2b0146 100644 --- a/milena/doc/examples/dpoint-1.cc +++ b/milena/doc/examples/dpoint-1.cc @@ -1,4 +1,5 @@ -#include <mln/essential/2d.hh> +#include <mln/core/alias/dpoint2d.hh> +#include <mln/core/alias/point2d.hh> int main() { using namespace mln; diff --git a/milena/doc/examples/estim-sites.cc b/milena/doc/examples/estim-sites.cc index 5678750..deed867 100644 --- a/milena/doc/examples/estim-sites.cc +++ b/milena/doc/examples/estim-sites.cc @@ -1,4 +1,5 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/geom/nsites.hh> int main() { using namespace mln; diff --git a/milena/doc/examples/extend.cc b/milena/doc/examples/extend.cc index 3448ddc..953afc0 100644 --- a/milena/doc/examples/extend.cc +++ b/milena/doc/examples/extend.cc @@ -1,6 +1,17 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/dmorph/extended.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/routine/extend.hh> +#include <mln/core/var.hh> + +#include <mln/level/transform.hh> + #include <mln/fun/p2b/big_chess.hh> + +#include <mln/value/rgb8.hh> +#include <mln/literal/colors.hh> + #include <tests/data.hh> + #include <doc/tools/sample_utils.hh> namespace mln diff --git a/milena/doc/examples/extension-ignore.cc b/milena/doc/examples/extension-ignore.cc index f3a0f4d..b5e88e7 100644 --- a/milena/doc/examples/extension-ignore.cc +++ b/milena/doc/examples/extension-ignore.cc @@ -1,4 +1,5 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/value/int_u8.hh> template <typename I> void my_routine(const mln::Image<I>&) diff --git a/milena/doc/examples/fill-call-1.cc b/milena/doc/examples/fill-call-1.cc index 1afba03..0a30c85 100644 --- a/milena/doc/examples/fill-call-1.cc +++ b/milena/doc/examples/fill-call-1.cc @@ -1,4 +1,7 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/data/fill.hh> + int main() { using namespace mln; diff --git a/milena/doc/examples/fill-part-image.cc b/milena/doc/examples/fill-part-image.cc index e3ad3a2..4e9dbf5 100644 --- a/milena/doc/examples/fill-part-image.cc +++ b/milena/doc/examples/fill-part-image.cc @@ -1,4 +1,16 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/var.hh> +#include <mln/core/site_set/p_array.hh> + +#include <mln/value/int_u8.hh> +#include <mln/value/label_8.hh> + +#include <mln/make/image.hh> + +#include <mln/data/fill.hh> + +#include <mln/debug/println.hh> + int main() { using namespace mln; diff --git a/milena/doc/examples/fill-subdomain-shorter.cc b/milena/doc/examples/fill-subdomain-shorter.cc index fc4d725..461195d 100644 --- a/milena/doc/examples/fill-subdomain-shorter.cc +++ b/milena/doc/examples/fill-subdomain-shorter.cc @@ -1,4 +1,20 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/var.hh> +#include <mln/core/alias/neighb2d.hh> + +#include <mln/labeling/blobs.hh> + +#include <mln/make/image.hh> + +#include <mln/value/rgb8.hh> +#include <mln/value/label_8.hh> +#include <mln/literal/colors.hh> + +#include <mln/pw/all.hh> + +#include <mln/data/fill.hh> + int main() { using namespace mln; diff --git a/milena/doc/examples/fill-subdomain.cc b/milena/doc/examples/fill-subdomain.cc index be94209..d1cfa94 100644 --- a/milena/doc/examples/fill-subdomain.cc +++ b/milena/doc/examples/fill-subdomain.cc @@ -1,5 +1,23 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/var.hh> +#include <mln/core/alias/neighb2d.hh> + +#include <mln/make/image.hh> + +#include <mln/value/rgb8.hh> +#include <mln/value/label_8.hh> +#include <mln/literal/colors.hh> + +#include <mln/pw/all.hh> + +#include <mln/labeling/blobs.hh> +#include <mln/labeling/colorize.hh> + +#include <mln/data/fill.hh> + #include <doc/tools/sample_utils.hh> + int main() { using namespace mln; diff --git a/milena/doc/examples/fill-subimage-cfun.cc b/milena/doc/examples/fill-subimage-cfun.cc index 06d2e0d..14fa3bb 100644 --- a/milena/doc/examples/fill-subimage-cfun.cc +++ b/milena/doc/examples/fill-subimage-cfun.cc @@ -1,4 +1,15 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/var.hh> + +#include <mln/make/image.hh> + +#include <mln/value/rgb8.hh> +#include <mln/value/label_8.hh> +#include <mln/literal/colors.hh> + +#include <mln/data/fill.hh> + #include <doc/tools/sample_utils.hh> // \{ bool row_oddity(mln::point2d p) diff --git a/milena/doc/examples/fill.cc b/milena/doc/examples/fill.cc index c4184b4..c05f984 100644 --- a/milena/doc/examples/fill.cc +++ b/milena/doc/examples/fill.cc @@ -1,4 +1,10 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/dmorph/image_if.hh> + +#include <mln/value/rgb8.hh> +#include <mln/io/ppm/load.hh> +#include <mln/literal/colors.hh> + #include <tests/data.hh> #include <doc/tools/sample_utils.hh> diff --git a/milena/doc/examples/forall-piter.cc b/milena/doc/examples/forall-piter.cc index 60011f9..9deb41e 100644 --- a/milena/doc/examples/forall-piter.cc +++ b/milena/doc/examples/forall-piter.cc @@ -1,4 +1,5 @@ -#include <mln/essential/2d.hh> +#include <mln/core/alias/box2d.hh> + int main() { using namespace mln; diff --git a/milena/doc/examples/fun-p2v-1.cc b/milena/doc/examples/fun-p2v-1.cc index 6a5725d..531930c 100644 --- a/milena/doc/examples/fun-p2v-1.cc +++ b/milena/doc/examples/fun-p2v-1.cc @@ -1,4 +1,4 @@ -#include <mln/essential/2d.hh> +#include <mln/core/alias/point2d.hh> // \{ unsigned my_values(const mln::point2d& p) { diff --git a/milena/doc/examples/graph-data.cc b/milena/doc/examples/graph-data.cc index 04cccf0..30e9ebf 100644 --- a/milena/doc/examples/graph-data.cc +++ b/milena/doc/examples/graph-data.cc @@ -1,5 +1,14 @@ -#include <mln/essential/2d.hh> +#include <mln/core/site_set/p_vertices.hh> +#include <mln/core/alias/point2d.hh> +#include <mln/core/concept/function.hh> +#include <mln/core/var.hh> + +#include <mln/fun/i2v/array.hh> #include <mln/util/graph.hh> +#include <mln/pw/all.hh> + +#include <vector> + // \{ template <typename S> diff --git a/milena/doc/examples/graph-iter.cc b/milena/doc/examples/graph-iter.cc index 613283a..338ae2f 100644 --- a/milena/doc/examples/graph-iter.cc +++ b/milena/doc/examples/graph-iter.cc @@ -1,5 +1,8 @@ -#include <mln/essential/2d.hh> +#include <mln/core/concept/function.hh> #include <mln/util/graph.hh> + +#include <vector> + #include <doc/tools/sample_utils.hh> struct viota_t : public mln::Function_p2v< viota_t > diff --git a/milena/doc/examples/ima-has.cc b/milena/doc/examples/ima-has.cc index bf4332d..4882a14 100644 --- a/milena/doc/examples/ima-has.cc +++ b/milena/doc/examples/ima-has.cc @@ -1,4 +1,4 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> int main() { using namespace mln; diff --git a/milena/doc/examples/ima-load.cc b/milena/doc/examples/ima-load.cc index 9f697fd..321ba9c 100644 --- a/milena/doc/examples/ima-load.cc +++ b/milena/doc/examples/ima-load.cc @@ -1,4 +1,5 @@ -# include <mln/core/io/pbm/load.hh> +#include <mln/core/image/image2d.hh> +#include <mln/io/pbm/load.hh> int main() { using namespace mln; diff --git a/milena/doc/examples/ima-save.cc b/milena/doc/examples/ima-save.cc index d802555..c9cb0aa 100644 --- a/milena/doc/examples/ima-save.cc +++ b/milena/doc/examples/ima-save.cc @@ -1,4 +1,6 @@ -# include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/io/pbm/save.hh> +#include <mln/make/image.hh> int main() { using namespace mln; diff --git a/milena/doc/examples/ima-size.cc b/milena/doc/examples/ima-size.cc index 8e67fac..2c89f93 100644 --- a/milena/doc/examples/ima-size.cc +++ b/milena/doc/examples/ima-size.cc @@ -1,4 +1,5 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/make/box2d.hh> int main() { using namespace mln; diff --git a/milena/doc/examples/ima2d-1.cc b/milena/doc/examples/ima2d-1.cc index 358dd3f..06f8a5e 100644 --- a/milena/doc/examples/ima2d-1.cc +++ b/milena/doc/examples/ima2d-1.cc @@ -1,4 +1,4 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> int main() { using namespace mln; diff --git a/milena/doc/examples/ima2d-2.cc b/milena/doc/examples/ima2d-2.cc index e9b5e79..0a503b1 100644 --- a/milena/doc/examples/ima2d-2.cc +++ b/milena/doc/examples/ima2d-2.cc @@ -1,4 +1,5 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/value/int_u8.hh> int main() { using namespace mln; diff --git a/milena/doc/examples/ima2d-4.cc b/milena/doc/examples/ima2d-4.cc index 6eee770..201ae63 100644 --- a/milena/doc/examples/ima2d-4.cc +++ b/milena/doc/examples/ima2d-4.cc @@ -1,4 +1,4 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> int main() { using namespace mln; diff --git a/milena/doc/examples/ima2d-5.cc b/milena/doc/examples/ima2d-5.cc index d4023af..c0f01e3 100644 --- a/milena/doc/examples/ima2d-5.cc +++ b/milena/doc/examples/ima2d-5.cc @@ -1,4 +1,4 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> int main() { using namespace mln; diff --git a/milena/doc/examples/ima2d-6-clone.cc b/milena/doc/examples/ima2d-6-clone.cc index bcc7fa2..6ec3c4b 100644 --- a/milena/doc/examples/ima2d-6-clone.cc +++ b/milena/doc/examples/ima2d-6-clone.cc @@ -1,4 +1,5 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/routine/duplicate.hh> int main() { using namespace mln; diff --git a/milena/doc/examples/ima2d-7.cc b/milena/doc/examples/ima2d-7.cc index 3f4cd35..ccb6294 100644 --- a/milena/doc/examples/ima2d-7.cc +++ b/milena/doc/examples/ima2d-7.cc @@ -1,4 +1,6 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/value/int_u8.hh> +#include <mln/data/fill.hh> int main() { using namespace mln; diff --git a/milena/doc/examples/ima2d-rot.cc b/milena/doc/examples/ima2d-rot.cc index 515f325..18e3663 100644 --- a/milena/doc/examples/ima2d-rot.cc +++ b/milena/doc/examples/ima2d-rot.cc @@ -1,5 +1,24 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/dmorph/extended.hh> +#include <mln/core/var.hh> +#include <mln/core/routine/extend.hh> + +#include <mln/value/rgb8.hh> + +#include <mln/border/fill.hh> + +#include <mln/literal/colors.hh> + +#include <mln/data/fill.hh> + +#include <mln/draw/box.hh> + +#include <mln/fun/x2x/rotation.hh> + +#include <mln/algebra/vec.hh> + #include <doc/tools/sample_utils.hh> + int main() { using namespace mln; diff --git a/milena/doc/examples/labeling-compute.cc b/milena/doc/examples/labeling-compute.cc index 1a340d4..feb7c5c 100644 --- a/milena/doc/examples/labeling-compute.cc +++ b/milena/doc/examples/labeling-compute.cc @@ -1,5 +1,20 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/alias/neighb2d.hh> + +#include <mln/make/image.hh> + +#include <mln/labeling/blobs.hh> +#include <mln/labeling/colorize.hh> +#include <mln/labeling/compute.hh> + +#include <mln/util/array.hh> + +#include <mln/accu/bbox.hh> + +#include <mln/value/label_8.hh> + #include <doc/tools/sample_utils.hh> + int main() { using namespace mln; diff --git a/milena/doc/examples/logical-not.cc b/milena/doc/examples/logical-not.cc index ac718b8..16cb0b4 100644 --- a/milena/doc/examples/logical-not.cc +++ b/milena/doc/examples/logical-not.cc @@ -1,4 +1,9 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> + +#include <mln/make/image.hh> + +#include <mln/logical/not.hh> + #include <doc/tools/sample_utils.hh> int main() { diff --git a/milena/doc/examples/mln_var.cc b/milena/doc/examples/mln_var.cc index ad3a59c..a0962f8 100644 --- a/milena/doc/examples/mln_var.cc +++ b/milena/doc/examples/mln_var.cc @@ -1,4 +1,6 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/concept/function.hh> #include <mln/pw/all.hh> #include <mln/core/var.hh> diff --git a/milena/doc/examples/parray-append.cc b/milena/doc/examples/parray-append.cc index 3bd7cdb..7220cb8 100644 --- a/milena/doc/examples/parray-append.cc +++ b/milena/doc/examples/parray-append.cc @@ -1,4 +1,5 @@ -#include <mln/essential/2d.hh> +#include <mln/core/site_set/p_array.hh> +#include <mln/core/alias/point2d.hh> int main() { using namespace mln; diff --git a/milena/doc/examples/parray-bbox.cc b/milena/doc/examples/parray-bbox.cc index e5d880f..0485b5f 100644 --- a/milena/doc/examples/parray-bbox.cc +++ b/milena/doc/examples/parray-bbox.cc @@ -1,4 +1,7 @@ -#include<mln/essential/2d.hh> +#include <mln/core/alias/point2d.hh> +#include <mln/core/alias/box2d.hh> +#include <mln/geom/bbox.hh> +#include <mln/core/site_set/p_array.hh> int main() { using namespace mln; diff --git a/milena/doc/examples/paste-call-1.cc b/milena/doc/examples/paste-call-1.cc index 01a8bc5..fe455e5 100644 --- a/milena/doc/examples/paste-call-1.cc +++ b/milena/doc/examples/paste-call-1.cc @@ -1,4 +1,12 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> + +#include <mln/make/box2d.hh> + +#include <mln/data/fill.hh> +#include <mln/data/paste.hh> + +#include <mln/debug/println.hh> + int main() { using namespace mln; diff --git a/milena/doc/examples/paste.cc b/milena/doc/examples/paste.cc index 65c5eb1..92663cf 100644 --- a/milena/doc/examples/paste.cc +++ b/milena/doc/examples/paste.cc @@ -1,4 +1,4 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> // \{ template <typename I, typename J> diff --git a/milena/doc/examples/point-1.cc b/milena/doc/examples/point-1.cc index e190b4c..735620c 100644 --- a/milena/doc/examples/point-1.cc +++ b/milena/doc/examples/point-1.cc @@ -1,4 +1,6 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/make/box2d.hh> + int main() { using namespace mln; diff --git a/milena/doc/examples/predicate-1.cc b/milena/doc/examples/predicate-1.cc index 6d99dfc..d2e5d5c 100644 --- a/milena/doc/examples/predicate-1.cc +++ b/milena/doc/examples/predicate-1.cc @@ -1,4 +1,4 @@ -# include <mln/essential/2d.hh> +#include <mln/core/alias/point2d.hh> // \{ //function_p2b diff --git a/milena/doc/examples/tuto2_first_image.cc b/milena/doc/examples/tuto2_first_image.cc index 0e3a6a6..7515a8e 100644 --- a/milena/doc/examples/tuto2_first_image.cc +++ b/milena/doc/examples/tuto2_first_image.cc @@ -1,4 +1,7 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/make/image.hh> +#include <mln/debug/println.hh> + #include <doc/tools/sample_utils.hh> int main() { diff --git a/milena/doc/examples/tuto3/first_routine.cc b/milena/doc/examples/tuto3/first_routine.cc index 5ed5919..2426a0f 100644 --- a/milena/doc/examples/tuto3/first_routine.cc +++ b/milena/doc/examples/tuto3/first_routine.cc @@ -1,6 +1,25 @@ /// \file doc/examples/tuto3/first_routine.cc -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/alias/neighb2d.hh> + +#include <mln/data/fill.hh> + +#include <mln/labeling/blobs.hh> +#include <mln/labeling/compute.hh> +#include <mln/labeling/blobs.hh> + +#include <mln/level/compare.hh> + +#include <mln/util/array.hh> + +#include <mln/value/label_8.hh> + +#include <mln/accu/count.hh> + +#include <mln/pw/all.hh> + #include <tests/data.hh> #include <doc/tools/sample_utils.hh> @@ -32,7 +51,7 @@ namespace mln for (unsigned i = 1; i <= nlabels; ++i) if (count[i] < 10u) - data::fill((output | pw::value(lbl) == pw::cst(i)).rw(), literal::zero); + data::fill((output | (pw::value(lbl) == pw::cst(i))).rw(), literal::zero); trace::exiting("my_algorithm"); return output; @@ -81,7 +100,7 @@ namespace sandbox // \{ for (unsigned i = 1; i <= nlabels; ++i) if (count[i] < 10u) - data::fill((output | pw::value(lbl) == pw::cst(i)).rw(), literal::zero); + data::fill((output | (pw::value(lbl) == pw::cst(i))).rw(), literal::zero); // \} // \{ diff --git a/milena/doc/examples/tuto3_rw_image.cc b/milena/doc/examples/tuto3_rw_image.cc index a130da8..7bc10d8 100644 --- a/milena/doc/examples/tuto3_rw_image.cc +++ b/milena/doc/examples/tuto3_rw_image.cc @@ -1,6 +1,14 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/value/rgb8.hh> +#include <mln/data/fill.hh> +#include <mln/data/paste.hh> +#include <mln/core/routine/duplicate.hh> +#include <mln/literal/colors.hh> +#include <mln/opt/at.hh> + #include <tests/data.hh> #include <doc/tools/sample_utils.hh> + int main() { using namespace mln; diff --git a/milena/doc/examples/tuto4_genericity_and_algorithms.cc b/milena/doc/examples/tuto4_genericity_and_algorithms.cc index cb091bb..9074c06 100644 --- a/milena/doc/examples/tuto4_genericity_and_algorithms.cc +++ b/milena/doc/examples/tuto4_genericity_and_algorithms.cc @@ -1,6 +1,36 @@ -#include <mln/essential/2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/routine/duplicate.hh> +#include <mln/core/site_set/p_array.hh> +#include <mln/core/var.hh> +#include <mln/core/alias/neighb2d.hh> + +#include <mln/fun/p2b/chess.hh> + +#include <mln/extract/green.hh> + +#include <mln/accu/max.hh> + +#include <mln/geom/all.hh> + +#include <mln/value/rgb8.hh> +#include <mln/value/label_8.hh> + +#include <mln/opt/at.hh> + +#include <mln/data/fill.hh> + +#include <mln/pw/all.hh> + #include <mln/binarization/threshold.hh> + #include <mln/labeling/colorize.hh> +#include <mln/labeling/blobs.hh> + +#include <mln/literal/colors.hh> +#include <mln/literal/max.hh> + + #include <tests/data.hh> #include <doc/tools/sample_utils.hh> @@ -8,7 +38,7 @@ struct keep_specific_colors : public mln::Function_v2b<keep_specific_colors> { bool operator()(const mln::value::rgb8& v) const { - return v.green() < 200 && v.blue() > 100; + return v.green() < 200u && v.blue() > 100u; } }; diff --git a/milena/doc/examples/win-create-1.cc b/milena/doc/examples/win-create-1.cc index b6d6e89..36d9d7a 100644 --- a/milena/doc/examples/win-create-1.cc +++ b/milena/doc/examples/win-create-1.cc @@ -1,4 +1,4 @@ -#include <mln/essential/2d.hh> +#include <mln/core/alias/window2d.hh> int main() { using namespace mln; diff --git a/milena/doc/examples/win-create-2.cc b/milena/doc/examples/win-create-2.cc index 193f729..13aa7ea 100644 --- a/milena/doc/examples/win-create-2.cc +++ b/milena/doc/examples/win-create-2.cc @@ -1,4 +1,6 @@ -#include <mln/essential/2d.hh> +#include <mln/core/alias/window2d.hh> +#include <mln/convert/to.hh> + int main() { using namespace mln; -- 1.5.6.5

1 0

3916: Improve global_vars test.
by Guillaume Lazzara 29 May '09

29 May '09

* tests/global_vars1.cc, * tests/global_vars2.cc: check potential global symbols duplications. --- milena/ChangeLog | 7 +++ milena/tests/global_vars1.cc | 88 +++++++++--------------------------------- milena/tests/global_vars2.cc | 79 +++++--------------------------------- 3 files changed, 36 insertions(+), 138 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 660fcb1..33aa88c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,4 +1,11 @@ 2009-05-28 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + Improve global_vars test. + + * tests/global_vars1.cc, + * tests/global_vars2.cc: check potential global symbols duplications. + +2009-05-28 Guillaume Lazzara <lazzara(a)lrde.epita.fr> Add a pretty_check target for tests. diff --git a/milena/tests/global_vars1.cc b/milena/tests/global_vars1.cc index c36f76f..8495acd 100644 --- a/milena/tests/global_vars1.cc +++ b/milena/tests/global_vars1.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -29,77 +30,26 @@ /// /// Tests proper global variable declarations -#include <mln/util/all.hh> -#include <mln/fun/p2v/all.hh> -#include <mln/fun/x2x/all.hh> -#include <mln/fun/v2v/all.hh> -#include <mln/fun/i2v/all.hh> -#include <mln/fun/all.hh> -#include <mln/fun/x2v/all.hh> -#include <mln/fun/p2b/all.hh> -#include <mln/extension/all.hh> -#include <mln/histo/all.hh> -#include <mln/trait/op/all.hh> -#include <mln/trait/all.hh> -#include <mln/trait/value/all.hh> -#include <mln/win/all.hh> -#include <mln/core/routine/all.hh> -#include <mln/core/trait/all.hh> -#include <mln/core/def/all.hh> -#include <mln/core/internal/check/image_all.hh> -#include <mln/core/image/all.hh> -#include <mln/core/site_set/all.hh> -#include <mln/io/pbm/all.hh> -#include <mln/io/pfm/all.hh> -#include <mln/io/pgm/all.hh> -#include <mln/io/all.hh> -#include <mln/io/fits/all.hh> -#include <mln/io/pnm/all.hh> -#include <mln/io/ppm/all.hh> -#include <mln/make/all.hh> -#include <mln/canvas/morpho/all.hh> -#include <mln/canvas/all.hh> -#include <mln/canvas/browsing/all.hh> -#include <mln/estim/all.hh> -#include <mln/arith/all.hh> -#include <mln/display/all.hh> -#include <mln/test/all.hh> -#include <mln/border/all.hh> -#include <mln/trace/all.hh> -#include <mln/debug/all.hh> -#include <mln/morpho/elementary/all.hh> -#include <mln/morpho/all.hh> -#include <mln/accu/all.hh> -#include <mln/pw/all.hh> -#include <mln/linear/all.hh> -#include <mln/metal/all.hh> -#include <mln/metal/math/all.hh> -#include <mln/set/all.hh> -#include <mln/convert/impl/all.hh> -#include <mln/convert/all.hh> -#include <mln/geom/all.hh> -#include <mln/literal/all.hh> -#include <mln/level/approx/all.hh> -#include <mln/level/all.hh> -#include <mln/level/naive/all.hh> -#include <mln/math/all.hh> -#include <mln/norm/all.hh> -#include <mln/logical/all.hh> -#include <mln/draw/all.hh> -#include <mln/value/builtin/all.hh> -#include <mln/value/all.hh> -#include <mln/value/internal/all.hh> -#include <mln/value/concept/all.hh> -#include <mln/tag/all.hh> -#include <mln/labeling/all.hh> - -#include <mln/essential/1d.hh> -#include <mln/essential/2d.hh> -#include <mln/essential/3d.hh> +#include <mln/all.hh> int f1(); +int f2(); int main () { - f1(); + { + int b1 = 10; + + mln::border::thickness = b1; + int b2 = f1(); + + mln_assertion(b1 == b2); + } + + { + mln::border::thickness = 4; + f2(); + + mln_assertion(mln::border::thickness == 2); + } } diff --git a/milena/tests/global_vars2.cc b/milena/tests/global_vars2.cc index b9d94eb..5071788 100644 --- a/milena/tests/global_vars2.cc +++ b/milena/tests/global_vars2.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -31,75 +32,15 @@ # define MLN_INCLUDE_ONLY -#include <mln/util/all.hh> -#include <mln/fun/p2v/all.hh> -#include <mln/fun/x2x/all.hh> -#include <mln/fun/v2v/all.hh> -#include <mln/fun/i2v/all.hh> -#include <mln/fun/all.hh> -#include <mln/fun/x2v/all.hh> -#include <mln/fun/p2b/all.hh> -#include <mln/extension/all.hh> -#include <mln/histo/all.hh> -#include <mln/trait/op/all.hh> -#include <mln/trait/all.hh> -#include <mln/trait/value/all.hh> -#include <mln/win/all.hh> -#include <mln/core/routine/all.hh> -#include <mln/core/trait/all.hh> -#include <mln/core/def/all.hh> -#include <mln/core/internal/check/image_all.hh> -#include <mln/core/image/all.hh> -#include <mln/core/site_set/all.hh> -#include <mln/io/pbm/all.hh> -#include <mln/io/pfm/all.hh> -#include <mln/io/pgm/all.hh> -#include <mln/io/all.hh> -#include <mln/io/fits/all.hh> -#include <mln/io/pnm/all.hh> -#include <mln/io/ppm/all.hh> -#include <mln/make/all.hh> -#include <mln/canvas/morpho/all.hh> -#include <mln/canvas/all.hh> -#include <mln/canvas/browsing/all.hh> -#include <mln/estim/all.hh> -#include <mln/arith/all.hh> -#include <mln/display/all.hh> -#include <mln/test/all.hh> -#include <mln/border/all.hh> -#include <mln/trace/all.hh> -#include <mln/debug/all.hh> -#include <mln/morpho/elementary/all.hh> -#include <mln/morpho/all.hh> -#include <mln/accu/all.hh> -#include <mln/pw/all.hh> -#include <mln/linear/all.hh> -#include <mln/metal/all.hh> -#include <mln/metal/math/all.hh> -#include <mln/set/all.hh> -#include <mln/convert/impl/all.hh> -#include <mln/convert/all.hh> -#include <mln/geom/all.hh> -#include <mln/literal/all.hh> -#include <mln/level/approx/all.hh> -#include <mln/level/all.hh> -#include <mln/level/naive/all.hh> -#include <mln/math/all.hh> -#include <mln/norm/all.hh> -#include <mln/logical/all.hh> -#include <mln/draw/all.hh> -#include <mln/value/builtin/all.hh> -#include <mln/value/all.hh> -#include <mln/value/internal/all.hh> -#include <mln/value/concept/all.hh> -#include <mln/tag/all.hh> -#include <mln/labeling/all.hh> - -#include <mln/essential/1d.hh> -#include <mln/essential/2d.hh> -#include <mln/essential/3d.hh> +#include <mln/all.hh> int f1 () { - return 0; + return mln::border::thickness; +} + + +void f2 () +{ + mln::border::thickness = 2; } -- 1.5.6.5

1 0

3915: Add a pretty_check target for tests.
by Guillaume Lazzara 29 May '09

29 May '09

* tests/Makefile.am: new target pretty_check. * tests/tools/pretty_check.sh: new. Script processing tests output. --- milena/ChangeLog | 8 + milena/tests/Makefile.am | 3 + milena/tests/tools/pretty_check.sh | 405 ++++++++++++++++++++++++++++++++++++ 3 files changed, 416 insertions(+), 0 deletions(-) create mode 100755 milena/tests/tools/pretty_check.sh diff --git a/milena/ChangeLog b/milena/ChangeLog index 25652da..660fcb1 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,4 +1,12 @@ 2009-05-28 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + Add a pretty_check target for tests. + + * tests/Makefile.am: new target pretty_check. + + * tests/tools/pretty_check.sh: new. Script processing tests output. + +2009-05-28 Guillaume Lazzara <lazzara(a)lrde.epita.fr> Small fixes. diff --git a/milena/tests/Makefile.am b/milena/tests/Makefile.am index 53e12ab..97330a3 100644 --- a/milena/tests/Makefile.am +++ b/milena/tests/Makefile.am @@ -61,3 +61,6 @@ essential_headers_SOURCES = essential_headers.cc global_vars_SOURCES = global_vars1.cc global_vars2.cc TESTS = $(check_PROGRAMS) + +pretty_check: + $(top_srcdir)/milena/tests/tools/pretty_check.sh diff --git a/milena/tests/tools/pretty_check.sh b/milena/tests/tools/pretty_check.sh new file mode 100755 index 0000000..d73820b --- /dev/null +++ b/milena/tests/tools/pretty_check.sh @@ -0,0 +1,405 @@ +#!/bin/sh + +# ################## +# # How to use it? # +# ################## +# +# ----------------- +# | Manual launch | +# ----------------- +# +# Launch the script and pass the path to milena/tests as argument. +# +# ./launch_tests /my/absolute/or/relative/path/to/milena/tests +# +# You may pass the path to a subdirectory of milena/tests if you want +# to run only a sub part of the test suite. +# +# +# -------------- +# | Using Make | +# -------------- +# +# In the build directory, go to milena/tests. Just run: +# +# make pretty_check +# +# A subdirectoy can also be passed to the script. Do as follow: +# +# TEST_DIR=accu make pretty_check +# +# Here, the pretty check will be run only in milena/tests/accu. +# +# +# Results are stored in a newly created directory ('tmp', by default). +# This directory is created in the directory from where you call this +# script. +# +# It contains two files: +# - check.log, the raw log of the test suite. +# - tests.html, the formated test suite results. +# +# +# +# +# _WARNING_: be aware of the fact this script run a make clean in the +# given path before running the tests. PREVIOUS TEST RESULTS +# ARE ALSO CLEARED. +# +# +# KNOWN BUGS: this script is supposed to sort compilation warnings and +# compilation errors separately. For unknown reasons, it is +# still buggy and errors and warnings may be mixed up in the +# formated page. Does anyone want to fix that? +# + +output_directory=tmp +output_file=tests.html +check_log="$PWD/$output_directory/check.log" + +base_make_path=$1 +if [ -z "$base_make_path" ]; then + if [ -z "$TEST_DIR" ]; then + base_make_path="." + else + base_make_path="$TEST_DIR" + fi +fi + + +gcc_wrapper="$PWD/$output_directory/gcc-wrapper.sh" + +cleanup_last_results() +{ + make -C $1 clean + find . -name '*.log' -exec rm -f {} \; + rm -Rf $output_directory + mkdir $output_directory +} + +cleanup_tmp_files() +{ + rm -f *.tmp +} + +begin_output_file() +{ + cat > $output_file << EOF +<html> + <head> + <script language="javascript" src="http://api.uttk.org/javascripts/uttk.js"></script> + <style type="text/css"> + @import url('http://api.uttk.org/stylesheets/uttk.css'); + </style> + </head> + <body> + <div id="uttk_contents"> +EOF +} + +end_output_file() +{ + cat >> $output_file << EOF + </div> + </body> +</html> +EOF +} + +begin_tmp_files() +{ + echo "<a name="top">Failed tests:</a><ol>" >> error_entry.html.tmp + echo "<a name="top">Compilation warnings:</a><ol>" >> warning_entry.html.tmp +} + +end_tmp_files() +{ + local ef="error_entry_html.tmp" + local wf="warning_entry_html.tmp" + close_dir_entry $ef + close_dir_entry $wf + echo "</ol><br>" >> $ef + echo "</ol><br>" >> $wf + close_dir error_node.html.tmp + close_dir warning_node.html.tmp +} + +make_output_file() +{ + begin_output_file + + echo "<table><tr><td valign=top>" >> $output_file + cat error_entry.html.tmp >> $output_file + echo "</td><td valign=top>" >> $output_file + cat warning_entry.html.tmp >> $output_file + echo "</td></tr></table><br><br>" >> $output_file + + cat error_node.html.tmp >> $output_file + echo "<br><hr><br>" >> $output_file + cat warning_node.html.tmp >> $output_file + + end_output_file +} + +open_dir() +{ + cat >> $2 << EOF + <div class="node"> + <table class="title" id="FAIL"> + <tr> + <td width="11px" <img src="http://api.uttk.org/images/triangle.gif"/></td> + <td>$1</td> + <td width="20px">$3</td> + </tr> + </table> + <br> +EOF + +} + +close_dir() +{ + echo "</div><br><br><br>" >> $1 +} + + +filtered_errors() +{ + # Convert '>' and '<' to html characters. + if [ -s $1 ]; then + cat $1 | sed -e 's/</\</g' | sed -e 's/>/\>/g' | sed -e 's/mln:://g' | sed -e 's/point<grid::square, short int>/point2d/g' | sed -e 's/error/<b>error<\/b>/g' | sed -e 's/warning/<b>warning<\/b>/g' | sed -e 's/Assertion/<b>Assertion<\/b>/g' | sed -e ':a;N;$!ba;s/\n/<br>/g' >> $2 + fi +} + +last_dir="" +last_wdir="" +open_dir_if_needed() +{ + local dir=$1 + local current_dir=$last_dir + if [ "$3" == "ABORT" ]; then + current_dir=$last_wdir + fi + + if [ "$current_dir" != "$dir" ]; then + if ! [ -z "$current_dir" ]; then + close_dir $2 + fi + open_dir $dir $2 $3 + if [ "$3" == "FAIL" ] || [ "$3" == "XFAIL" ]; then + last_dir=$dir + else + last_wdir=$dir + fi + fi +} + + +error_node() +{ + local name=$1 + local file=$2 + local command=$3 + local log=$4 + local output=$6_node.html.tmp + local class_id=$7 + open_dir_if_needed $5 $output $class_id + cat >> $output << EOF + <div class="node"> + <table class="title" id="$class_id"> + <tr> + <td width="11px" <img src="http://api.uttk.org/images/triangle.gif"/></td> + <td><a name="$name">$name</a></td> + <td width="20px"><a href="#top">^ TOP</a></td> + </tr> + </table> + <div class="leaf"> + <table class="title" id=""> + <tr> + <td>command: </td> + <td><pre class="attribute_alone">$command</pre></td> + </tr> + <tr><td colspan=2> </td></tr> + <tr> + <td> Compilation warnings/errors:</td> + <td> +EOF + filtered_errors $log.comp.log $output + + cat >> $output << EOF + </td> + </tr> + <tr><td colspan=2> </td></tr> + <tr> + <td> Error output:</td> + <td> +EOF + + filtered_errors $log.log $output + + cat >> $output << EOF + </td> + </tr> + </table> + </div> + + </div> + <br> +EOF +} + +close_dir_entry() +{ + echo "</ol>" >> $1 +} + +open_dir_entry() +{ + echo "<li><b>$1</b></li><ol>" >> $2 +} + +last_dir_entry="" +last_wdir_entry="" +open_dir_entry_if_needed() +{ + local dir=$1 + current_dir=$last_dir_entry + if [ "$3" == "ABORT" ]; then + current_dir=$last_wdir_entry + fi + if [ "$current_dir" != "$dir" ]; then + if ! [ -z "$current_dir" ]; then + close_dir_entry $2 + fi + open_dir_entry $dir $2 + if [ "$3" == "FAIL" ] || [ "$3" == "XFAIL" ]; then + last_dir_entry=$dir + else + last_wdir_entry=$dir + fi + fi +} + +error_entry() +{ + local name=$1 + local dir=$2 + local output=$3_entry.html.tmp + open_dir_entry_if_needed $dir $output $4 + echo "<li><a href=\"#$name\">$name</a></li>" >> $output +} + + +make_gcc_wrapper() +{ + cat >> "$gcc_wrapper" << EOF +#/bin/sh +# Automatically generated. Do not modify. + +############################################################# +# # +# Wrapper around GCC in order to log the compilation output # +# for each file. # +# # +############################################################# + +next=0 +file="" + +#Try to catch the test name. +for arg in \$@; do + if [ \$next -eq 1 ]; then + file=\$arg + break + fi + if [ "\$arg" == "-o" ]; then + next=1 + fi +done + +name=\`basename \$file .o\` + +# Compile and log the compilation output. +g++ 2>\$name.comp.log \$@ +EOF + + chmod +x "$gcc_wrapper" +} + +cleanup_gcc_wrapper() +{ + rm "$gcc_wrapper" +} + + +main() +{ + cleanup_last_results $base_make_path + + make_gcc_wrapper + + make CXX="$gcc_wrapper" -C $base_make_path check -k 1>$check_log 2>&1 + + cd $output_directory + begin_tmp_files + + for tdir in `find ../$base_make_path -maxdepth 0 -type d | grep -v "$output_directory" | grep -v "\.svn" | grep -vE "^../$"`; do + for log in `find $tdir -type f -name '*.comp.log'`; do + echo "processing $log" + local name=`basename $log .comp.log` + local dir=`dirname $log` + local bdir=`echo $dir | sed -e 's/\.\.\///g'` + local status=`grep ": $name\$" $check_log | cut -d ':' -f 1` + + # Empty compilation logs + # Did compile without error/warning. + if ! [ -s $log ]; then + + # Status FAIL or XFAIL found in logs. + # failed during execution. + if [ "$status" == "FAIL" ] || [ "$status" == "XFAIL" ]; then + + grep -B 2 ": $name\$" $check_log | head -n 1 > "$dir/$name.log" + error_entry $name $bdir error $status + error_node $name $log "./$name" "$dir/$name" $bdir error $status + fi + + # Empty compilation and runtime logs. + # Everything went well. Not reporting anything. + + + # Compilation logs are not empty. + # There were errors or warnings at compile time. + else + # No test status found in logs. + # Did not compile. + if [ -z "$status" ]; then + error_entry $name $bdir error FAIL + error_node $name $log "./$name" "$dir/$name" $bdir error FAIL + + # Status FAIL or XFAIL found in logs. + # Did compile with warnings and failed at runtime. + elif [ "$status" == "FAIL" ] || [ "$status" == "XFAIL" ]; then + error_entry $name $bdir error $status + error_node $name $log "./$name" "$dir/$name" $bdir error $status + + # Status PASS. + # Compiled with warnings and passed at runtime. + else + error_entry $name $bdir warning ABORT + error_node $name $log "./$name" "$dir/$name" $bdir warning ABORT + fi + fi + done + done + + # Build pretty output. + end_tmp_files + make_output_file + + # Cleanup temporary files. + cleanup_tmp_files + cleanup_gcc_wrapper +} + +main -- 1.5.6.5

1 0

[Olena] #192: Move the contents of mln::level to mln::data
by Olena Trac 29 May '09

29 May '09

#192: Move the contents of mln::level to mln::data ----------------------+----------------------------------------------------- Reporter: theo | Owner: Olena Team Type: task | Status: new Priority: critical | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Keywords: | ----------------------+----------------------------------------------------- -- Ticket URL: <https://trac.lrde.org/olena/ticket/192> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

2 3

r3914: Add tools for plotting multiple points in an image
by Fabien Freling 28 May '09

28 May '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-05-28 Fabien Freling <fabien.freling(a)lrde.epita.fr> Add tools for plotting multiple points in an image. * fabien/igr/min_max_float.cc: Return min and max values of an image. * fabien/igr/plot_points/Makefile: New Makefile for plot tools. * fabien/igr/plot_points/README: Explain how tools works. * fabien/igr/plot_points/main.cc: Plot all points in an image. * fabien/igr/plot_points/plot_points_of_label.cc: Plot all points of a specific label. --- min_max_float.cc | 89 ++++++++++++++++++++++++++++++++++++ plot_points/Makefile | 11 ++++ plot_points/README | 2 plot_points/main.cc | 77 +++++++++++++++++++++++++++++++ plot_points/plot_points_of_label.cc | 88 +++++++++++++++++++++++++++++++++++ 5 files changed, 267 insertions(+) Index: trunk/milena/sandbox/fabien/igr/min_max_float.cc =================================================================== --- trunk/milena/sandbox/fabien/igr/min_max_float.cc (revision 0) +++ trunk/milena/sandbox/fabien/igr/min_max_float.cc (revision 3914) @@ -0,0 +1,89 @@ +#include <iostream> +#include <cmath> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image3d.hh> + +#include <mln/io/dump/all.hh> +#include <mln/io/plot/save.hh> + +#include <mln/value/int_u12.hh> + +#include <mln/histo/array.hh> +#include <mln/histo/compute.hh> +#include <mln/level/transform.hh> + + +namespace mln +{ + struct int_u12_from_float : Function_v2v< int_u12_from_float > + { + int_u12_from_float(float min, float max) + { + min_ = min; + max_ = max; + } + + typedef value::int_u12 result; + float min_; + float max_; + + result operator()(float f) const + { + if (f > max_) + f = max_; + f -= min_; + f /= (max_ - min_); + f *= 4095; // int_u12 max + + return (int) floor(f); + } + }; + +} // end of namespace mln + + +/////////////////// +// // +// Main Function // +// // +/////////////////// + + +int main(int argc, char *argv[]) +{ + using namespace mln; + + if (argc != 2) + { + std::cout << "Usage: " << argv[0] << " ima.dump" + << std::endl; + return 1; + } + + float min = 1; + float max = -1; + + image3d<float> input; + io::dump::load(input, argv[1]); + + mln_piter_(image3d<float>) p(input.domain()); + for_all(p) + { + if (input(p) > max) + max = input(p); + if (input(p) < min) + min = input(p); + } + + std::cout << "min: " << min << std::endl; + std::cout << "max: " << max << std::endl; + + /*image3d<value::int_u12> quantified = level::transform(input, int_u12_from_float(min, max)); + + histo::array<value::int_u12> histogram = histo::compute(quantified); + image1d<value::int_u12> hist_ima; + convert::from_to(histogram, hist_ima); + io::plot::save(hist_ima, "histogram.plot");*/ + + return 0; +} Index: trunk/milena/sandbox/fabien/igr/plot_points/plot_points_of_label.cc =================================================================== --- trunk/milena/sandbox/fabien/igr/plot_points/plot_points_of_label.cc (revision 0) +++ trunk/milena/sandbox/fabien/igr/plot_points/plot_points_of_label.cc (revision 3914) @@ -0,0 +1,88 @@ +#include <sstream> + +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/core/image/image3d.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/image/dmorph/slice_image.hh> +#include <mln/core/routine/duplicate.hh> +#include <mln/core/var.hh> + +#include <mln/io/dump/all.hh> +#include <mln/io/plot/save.hh> + +#include <mln/value/int_u12.hh> +#include <mln/value/label_16.hh> + +#include <mln/pw/all.hh> +#include <mln/util/array.hh> + + +using namespace mln; +using value::int_u12; +using value::label_16; + + + + +int usage(const char* bin) +{ + std::cout << "Usage: " << bin << " input.dump wst.dump label" << std::endl; + return 1; +} + +int main(int argc, char* argv[]) +{ + if (argc != 4) + return usage(argv[0]); + + unsigned label = atoi(argv[3]); + + + // Initialization. + typedef int_u12 V; + image3d<V> input; + io::dump::load(input, argv[1]); + typedef image2d<util::array<V> > I; + I ima_arr; + initialize(ima_arr, slice(input, 0)); + for (unsigned int i = 0; i < input.nslices(); ++i) + { + image2d<V> tmp_slice = duplicate(slice(input, i)); + mln_piter_(image2d<V>) p(tmp_slice.domain()); + for_all(p) + ima_arr(p).append(tmp_slice(p)); + } + + image2d<label_16> ima_labels; + io::dump::load(ima_labels, argv[2]); + + // Plot points. + int origin_x = ima_arr.bbox().pmin()[1]; + int origin_y = ima_arr.bbox().pmin()[0]; + + mln_VAR(ima_if, ima_arr | pw::value(ima_labels) == pw::cst(label)); + mln_piter_(ima_if_t) p(ima_if.domain()); + for_all(p) + { + int x = p[1] - origin_x; + int y = p[0] - origin_y; + std::ostringstream slabel; + slabel << "x"; + if (x < 100) + slabel << "0"; + if (x < 10) + slabel << "0"; + slabel << x << "_y"; + if (y < 100) + slabel << "0"; + if (y < 10) + slabel << "0"; + slabel << y << ".plot"; + + io::plot::save(ima_arr(p), slabel.str()); + } + + return 0; +} Index: trunk/milena/sandbox/fabien/igr/plot_points/main.cc =================================================================== --- trunk/milena/sandbox/fabien/igr/plot_points/main.cc (revision 0) +++ trunk/milena/sandbox/fabien/igr/plot_points/main.cc (revision 3914) @@ -0,0 +1,77 @@ +#include <sstream> + +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/core/image/image3d.hh> +#include <mln/core/image/slice_image.hh> +#include <mln/core/routine/duplicate.hh> + +#include <mln/io/dump/all.hh> +#include <mln/io/plot/save.hh> + +#include <mln/value/int_u12.hh> +#include <mln/util/array.hh> + + +using namespace mln; +using value::int_u12; + + + + +int usage(const char* bin) +{ + std::cout << "Usage: " << bin << " input.dump" << std::endl; + return 1; +} + +int main(int argc, char* argv[]) +{ + if (argc != 2) + return usage(argv[0]); + + + // Initialization. + typedef int_u12 V; + image3d<V> input; + io::dump::load(input, argv[1]); + typedef image2d<util::array<V> > I; + I ima_arr; + initialize(ima_arr, slice(input, 0)); + for (unsigned int i = 0; i < input.nslices(); ++i) + { + image2d<V> tmp_slice = duplicate(slice(input, i)); + mln_piter_(image2d<V>) p(tmp_slice.domain()); + for_all(p) + ima_arr(p).append(tmp_slice(p)); + } + + + // Plot points. + int origin_x = ima_arr.bbox().pmin()[1]; + int origin_y = ima_arr.bbox().pmin()[0]; + + mln_piter_(I) p (ima_arr.domain()); + for_all(p) + { + int x = p[1] - origin_x; + int y = p[0] - origin_y; + std::ostringstream slabel; + slabel << "x"; + if (x < 100) + slabel << "0"; + if (x < 10) + slabel << "0"; + slabel << x << "_y"; + if (y < 100) + slabel << "0"; + if (y < 10) + slabel << "0"; + slabel << y << ".plot"; + + io::plot::save(ima_arr(p), slabel.str()); + } + + return 0; +} Index: trunk/milena/sandbox/fabien/igr/plot_points/Makefile =================================================================== --- trunk/milena/sandbox/fabien/igr/plot_points/Makefile (revision 0) +++ trunk/milena/sandbox/fabien/igr/plot_points/Makefile (revision 3914) @@ -0,0 +1,11 @@ +include ../Makefile.rules + +all: main.cc + ${CXX} -I../../../../ ${CXXFLAGS} $^ -o plot_all_points + +plot_points_of_label: plot_points_of_label.cc + ${CXX} -I../../../../ ${CXXFLAGS} $^ -o plot_points_all_label + + +clean: + rm -rf *.dump *.p?m *.plot *.log *.csv *.dSYM Index: trunk/milena/sandbox/fabien/igr/plot_points/README =================================================================== --- trunk/milena/sandbox/fabien/igr/plot_points/README (revision 0) +++ trunk/milena/sandbox/fabien/igr/plot_points/README (revision 3914) @@ -0,0 +1,2 @@ +This directory is used for demonstrating that different points of the same label share the same behavior. +We show this by extracting plot functions.

1 0

Re: [Olena-patches] [Olena] #85: Ensure the milena/tests/ hierarchy follows milena/mln/'s one
by Olena Trac 28 May '09

28 May '09

#85: Ensure the milena/tests/ hierarchy follows milena/mln/'s one -----------------------+---------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: task | Status: new Priority: critical | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Resolution: | Keywords: -----------------------+---------------------------------------------------- Changes (by theo): * priority: major => critical Old description: > source:trunk/milena/mln/ and source:trunk/milena/tests/ shall be > parallel, with some exceptions (for instance, the reproducing the sub- > hierarchy of source:trunk/milena/mln/core into > source:trunk/milena/tests/core might be overkill). New description: source:trunk/milena/mln/ and source:trunk/milena/tests/ shall be parallel, with some exceptions (for instance, the reproducing the sub-hierarchy of source:trunk/milena/mln/core into source:trunk/milena/tests/core might be overkill). Moreover : * File names should match. * Create a script to detect discrepancies (possibly supporting a list of exceptions) between files names in `milena/mln/` and `milena/tests/`. -- -- Ticket URL: <https://trac.lrde.org/olena/ticket/85#comment:2> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0

Re: [Olena-patches] [Olena] #9: Kill Doxygen warnings
by Olena Trac 28 May '09

28 May '09

#9: Kill Doxygen warnings -----------------------+---------------------------------------------------- Reporter: levill_r | Owner: levill_r Type: defect | Status: closed Priority: minor | Milestone: Olena 0.11.1 Component: other | Version: 0.11 Resolution: wontfix | Keywords: documentation doxygen -----------------------+---------------------------------------------------- Changes (by theo): * status: new => closed * resolution: => wontfix Comment: Olena 0.11 is no longer developed; closing. -- Ticket URL: <https://trac.lrde.org/olena/ticket/9#comment:2> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0

[Olena] #194: Reorganize the concepts of functions
by Olena Trac 28 May '09

28 May '09

#194: Reorganize the concepts of functions ----------------------+----------------------------------------------------- Reporter: theo | Owner: Olena Team Type: defect | Status: new Priority: critical | Milestone: Component: Milena | Version: 1.0 Keywords: | ----------------------+----------------------------------------------------- 1. Typical issue: `Function_p2v` versus `Function_v2v` when the input value is a point. * Simplify. * But keep the directories in implementation (`mln/fun/*/`) 1. Function names are not consistent. -- Ticket URL: <https://trac.lrde.org/olena/ticket/194> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0

[Olena] #193: List of files to prune from the distribution
by Olena Trac 28 May '09

28 May '09

#193: List of files to prune from the distribution ----------------------+----------------------------------------------------- Reporter: theo | Owner: Olena Team Type: task | Status: new Priority: critical | Milestone: Component: Milena | Version: 1.0 Keywords: | ----------------------+----------------------------------------------------- 1. Write down this list in this ticket. 2. Store in in a file, and take it into account when generating the list of files to be distributed. 3. Explain the process (in the developers' documentation). -- Ticket URL: <https://trac.lrde.org/olena/ticket/193> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0