Commit 94e925e2 authored by Thierry Geraud's avatar Thierry Geraud
Browse files

Rename level/ stuff to data/ and labeling/level to /value.

	* mln/labeling/level.hh,
	* mln/labeling/level.spe.hh,
	* tests/labeling/level.cc: Rename as...
	* mln/labeling/value.hh,
	* mln/labeling/value.spe.hh,
	* tests/labeling/value.cc: ...those.
	Update
	* mln/labeling/all.hh: Update.

	* mln/data/approx,
	* tests/data/approx,
	* mln/data/naive,
	* tests/data/naive: New directories.
	
	* mln/level/update.hh,
	* mln/level/apply.hh,
	* mln/level/was.median.hh,
	* mln/level/compare.hh,
	* mln/level/essential.hh,
	* mln/level/saturate.hh,
	* mln/level/median.hh,
	* mln/level/transform.spe.hh,
	* mln/level/naive/essential.hh,
	* mln/level/naive/all.hh,
	* mln/level/naive/median.hh,
	* mln/level/abs.hh,
	* mln/level/transform_inplace.hh,
	* mln/level/to_enc.hh,
	* mln/level/all.hh,
	* mln/level/fast_median.hh,
	* mln/level/approx/essential.hh,
	* mln/level/approx/all.hh,
	* mln/level/approx/median.hh,
	* mln/level/replace.hh,
	* mln/level/apply.spe.hh,
	* mln/level/transform.hh,
	* mln/level/stretch.hh,
	* mln/level/compute.hh,
	* mln/level/sort_psites.hh,
	* mln/level/convert.hh,
	* mln/level/sort_offsets.hh: Move to...

	* mln/data/update.hh,
	* mln/data/was.median.hh,
	* mln/data/transform.spe.hh,
	* mln/data/to_enc.hh,
	* mln/data/transform.hh,
	* mln/data/replace.hh,
	* mln/data/approx/essential.hh,
	* mln/data/approx/all.hh,
	* mln/data/approx/median.hh,
	* mln/data/apply.spe.hh,
	* mln/data/stretch.hh,
	* mln/data/sort_offsets.hh,
	* mln/data/apply.hh,
	* mln/data/compare.hh,
	* mln/data/saturate.hh,
	* mln/data/median.hh,
	* mln/data/naive/essential.hh,
	* mln/data/naive/all.hh,
	* mln/data/naive/median.hh,
	* mln/data/abs.hh,
	* mln/data/transform_inplace.hh,
	* mln/data/fast_median.hh,
	* mln/data/compute.hh,
	* mln/data/sort_psites.hh,
	* mln/data/convert.hh: ...those new files.
	Update.
	
	* mln/data/all.hh,
	* mln/data/essential.hh: Update.

	* mln/level: Remove this directory.
	* mln/all.hh: Update.
	
	* tests/level/median.cc,
	* tests/level/transform_full.cc,
	* tests/level/compute_full.cc,
	* tests/level/stretch_full.cc,
	* tests/level/all_headers.cc,
	* tests/level/abs.cc,
	* tests/level/transform_inplace.cc,
	* tests/level/apply_full.cc,
	* tests/level/compare_full.cc,
	* tests/level/median_fast.cc,
	* tests/level/saturate_full.cc,
	* tests/level/replace.cc,
	* tests/level/transform.cc,
	* tests/level/stretch.cc,
	* tests/level/compute.cc,
	* tests/level/naive,
	* tests/level/naive/median.cc,
	* tests/level/naive/Makefile.am,
	* tests/level/sort_psites.cc,
	* tests/level/convert.cc,
	* tests/level/update.cc,
	* tests/level/approx,
	* tests/level/approx/median.cc,
	* tests/level/approx/Makefile.am,
	* tests/level/apply.cc,
	* tests/level/compare.cc,
	* tests/level/abs_full.cc,
	* tests/level/saturate.cc: Move to...

	* tests/data/transform_full.cc,
	* tests/data/median.cc,
	* tests/data/compute_full.cc,
	* tests/data/all_headers.cc,
	* tests/data/abs.cc,
	* tests/data/transform_inplace.cc,
	* tests/data/apply_full.cc,
	* tests/data/median_fast.cc,
	* tests/data/compute.cc,
	* tests/data/sort_psites.cc,
	* tests/data/convert.cc,
	* tests/data/update.cc,
	* tests/data/abs_full.cc,
	* tests/data/stretch_full.cc,
	* tests/data/compare_full.cc,
	* tests/data/saturate_full.cc,
	* tests/data/replace.cc,
	* tests/data/transform.cc,
	* tests/data/stretch.cc,
	* tests/data/apply.cc,
	* tests/data/compare.cc,
	* tests/data/saturate.cc: ...those new files.
	Update.

	* tests/data/Makefile.am: Update.
	* tests/Makefile.am: Update.

	Propagate those renamings.
	
	* trash/to_tiles.hh,
	* trash/display_save.hh,
	* trash/translate_image.cc,
	* trash/display_color_pretty.cc,
	* trash/save_and_show.cc,
	* trash/to_tiles.cc,
	* trash/display_color_pretty.hh,
	* mln/trait/accumulators.hh,
	* mln/debug/superpose.hh,
	* mln/world/binary_2d/subsample.hh,
	* mln/world/binary_2d/enlarge.hh,
	* mln/core/image/imorph/labeled_image.hh,
	* mln/core/concept/object.hh,
	* mln/arith/min.hh,
	* mln/arith/min.spe.hh,
	* mln/arith/diff_abs.hh,
	* mln/data/approx/essential.hh,
	* mln/data/approx/all.hh,
	* mln/data/approx/median.hh,
	* mln/data/naive/essential.hh,
	* mln/data/naive/all.hh,
	* mln/data/naive/median.hh,
	* mln/linear/sobel_2d.hh,
	* mln/linear/gaussian.hh,
	* mln/linear/gaussian/impl.hh,
	* mln/transform/hough.hh,
	* mln/estim/sum.hh,
	* mln/estim/min_max.hh,
	* mln/estim/mean.hh,
	* mln/essential/routine.hh,
	* mln/binarization/binarization.hh,
	* mln/morpho/watershed/superpose.hh,
	* mln/morpho/tree/compute_parent.hh,
	* mln/morpho/tree/max.hh,
	* mln/morpho/approx/dilation.hh,
	* mln/morpho/plus.hh,
	* mln/morpho/min.hh,
	* mln/morpho/reconstruction/by_erosion/union_find.hh,
	* mln/morpho/reconstruction/by_dilation/union_find.hh,
	* mln/morpho/minus.hh,
	* mln/morpho/complementation.hh,
	* mln/morpho/Rd.hh,
	* mln/morpho/includes.hh,
	* mln/morpho/leveling_filter.hh,
	* mln/morpho/algebraic_filter.hh,
	* mln/logical/and.hh,
	* mln/logical/and_not.hh,
	* mln/logical/includes.hh,
	* mln/logical/xor.hh,
	* mln/logical/not.hh,
	* mln/logical/or.hh,
	* mln/canvas/morpho/attribute_filter.hh,
	* mln/canvas/labeling.hh,
	* mln/labeling/colorize.hh,
	* mln/labeling/regional_minima.hh,
	* mln/labeling/regional_maxima.hh,
	* mln/labeling/mean_values.hh,
	* mln/labeling/blobs.hh,
	* mln/labeling/relabel.hh,
	* mln/labeling/wrap.hh,
	* mln/labeling/foreground.hh,
	* mln/labeling/pack.hh,
	* mln/labeling/background.hh,
	* mln/util/tree_to_image.hh,
	* tools/seed2tiling.cc,
	* tests/topo/skeleton/crest.cc,
	* tests/debug/iota.cc,
	* tests/world/inter_pixel/compute.cc,
	* tests/world/inter_pixel/immerse.cc,
	* tests/world/inter_pixel/dim2/make_edge_image.cc,
	* tests/world/inter_pixel/display_edge.cc,
	* tests/world/binary_2d/enlarge.cc,
	* tests/core/other/clock_test.cc,
	* tests/core/image/sparse_image.cc,
	* tests/core/image/obased_rle_image.cc,
	* tests/core/image/value_enc_image.cc,
	* tests/core/image/plain.cc,
	* tests/core/image/dmorph/slice_image.cc,
	* tests/core/image/fi_adaptor.cc,
	* tests/core/image/mono_rle_image.cc,
	* tests/core/image/rle_image.cc,
	* tests/core/image/vmorph/cast_image.cc,
	* tests/core/image/mono_obased_rle_image.cc,
	* tests/draw/graph.cc,
	* tests/draw/line.cc,
	* tests/opt/at.cc,
	* tests/transformation/rotate.cc,
	* tests/arith/minus.cc,
	* tests/arith/diff_abs.cc,
	* tests/arith/times.cc,
	* tests/arith/plus.cc,
	* tests/arith/revert.cc,
	* tests/data/fill_with_image.cc,
	* tests/data/approx/median.cc,
	* tests/data/paste_full.cc,
	* tests/data/paste.cc,
	* tests/data/naive/median.cc,
	* tests/linear/convolve.cc,
	* tests/linear/lap.cc,
	* tests/linear/log.cc,
	* tests/linear/convolve_directional.cc,
	* tests/linear/convolve_2x1d.cc,
	* tests/linear/sobel_2d.cc,
	* tests/linear/gaussian.cc,
	* tests/transform/distance_and_closest_point_geodesic.cc,
	* tests/accu/transform_snake.cc,
	* tests/accu/image/to_result.cc,
	* tests/accu/image/take_n_times.cc,
	* tests/accu/image/init.cc,
	* tests/accu/image/take.cc,
	* tests/accu/image/set_value.cc,
	* tests/accu/image/untake.cc,
	* tests/accu/image/take_as_init.cc,
	* tests/accu/transform_diagonal.cc,
	* tests/accu/transform.cc,
	* tests/accu/nil.cc,
	* tests/accu/transform_line.cc,
	* tests/accu/min.cc,
	* tests/accu/max.cc,
	* tests/accu/line.cc,
	* tests/accu/transform_directional.cc,
	* tests/make/image3d.cc,
	* tests/convert/to_image.cc,
	* tests/geom/seed2tiling_roundness.cc,
	* tests/geom/seed2tiling.cc,
	* tests/fun/v2v/hsl_to_rgb.cc,
	* tests/fun/v2v/rgb_to_hsl.cc,
	* tests/binarization/threshold.cc,
	* tests/morpho/artificial_line_graph_image_wst.cc,
	* tests/morpho/watershed/flooding.cc,
	* tests/morpho/watershed/superpose.cc,
	* tests/morpho/closing/area.cc,
	* tests/morpho/tree/compute_attribute_image.cc,
	* tests/morpho/tree/filter/filter.cc,
	* tests/morpho/tree/compute_parent.cc,
	* tests/morpho/tree/max.cc,
	* tests/morpho/tree/data.cc,
	* tests/morpho/skeleton_constrained.cc,
	* tests/morpho/reconstruction/by_erosion/union_find.cc,
	* tests/morpho/reconstruction/by_dilation/union_find.cc,
	* tests/morpho/rank_filter.cc,
	* tests/morpho/lena_line_graph_image_wst2.cc,
	* tests/io/pgm/pgm27.cc,
	* tests/io/pgm/pgm19.cc,
	* tests/io/pgm/pgm.cc,
	* tests/io/pgm/pgm16.cc,
	* tests/io/fits/fits.cc,
	* tests/io/dump/dump.cc,
	* tests/io/tiff/load.cc,
	* tests/io/tiff/tiff2pbm.cc,
	* tests/io/dicom/dicom.cc,
	* tests/io/magick/save.cc,
	* tests/io/magick/load.cc,
	* tests/io/ppm/ppm.cc,
	* tests/io/ppm/ppm23.cc,
	* tests/io/ppm/ppm16.cc,
	* tests/io/pbm/pbm.cc,
	* tests/logical/not.cc,
	* tests/logical/or.cc,
	* tests/logical/and.cc,
	* tests/logical/and_not.cc,
	* tests/logical/xor.cc,
	* tests/canvas/chamfer.cc,
	* tests/canvas/browsing/snake_generic_2d_vert.cc,
	* tests/canvas/browsing/snake_generic_2d_hori.cc,
	* tests/canvas/browsing/snake_generic_3d_vert.cc,
	* tests/canvas/browsing/diagonal2d.cc,
	* tests/canvas/browsing/snake_generic_3d_hori.cc,
	* tests/canvas/browsing/backdiagonal2d.cc,
	* tests/labeling/mean_values.cc,
	* tests/labeling/n_max.cc,
	* tests/labeling/flat_zones.cc,
	* tests/labeling/wrap.cc,
	* tests/labeling/foreground.cc,
	* tests/labeling/pack.cc,
	* tests/labeling/Makefile.am,
	* tests/labeling/colorize.cc,
	* tests/util/tree_to_image.cc,
	* tests/util/tree_fast_to_image.cc,
	* apps/statues/mesh-max-curv.cc,
	* apps/statues/mesh-complex-max-curv.cc,
	* doc/benchmark/canvas.cc,
	* doc/benchmark/median/median_bench.cc,
	* doc/examples/trash/tuto_one.cc,
	* doc/examples/trash/labeling_algo.cc,
	* doc/examples/trash/tuto_bis.cc,
	* doc/examples/trash/graph.cc,
	* doc/examples/accu-right-instanciation.cc,
	* doc/examples/extend.cc,
	* doc/examples/tuto3/first_routine.cc: Propagate renamings.


git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@3928 4aad255d-cdde-0310-9447-f3009e2ae8c0
parent 153e06d0
2009-05-29 Thierry Geraud <thierry.geraud@lrde.epita.fr>
Rename level/ stuff to data/ and labeling/level to /value.
* mln/labeling/level.hh,
* mln/labeling/level.spe.hh,
* tests/labeling/level.cc: Rename as...
* mln/labeling/value.hh,
* mln/labeling/value.spe.hh,
* tests/labeling/value.cc: ...those.
Update
* mln/labeling/all.hh: Update.
* mln/data/approx,
* tests/data/approx,
* mln/data/naive,
* tests/data/naive: New directories.
* mln/level/update.hh,
* mln/level/apply.hh,
* mln/level/was.median.hh,
* mln/level/compare.hh,
* mln/level/essential.hh,
* mln/level/saturate.hh,
* mln/level/median.hh,
* mln/level/transform.spe.hh,
* mln/level/naive/essential.hh,
* mln/level/naive/all.hh,
* mln/level/naive/median.hh,
* mln/level/abs.hh,
* mln/level/transform_inplace.hh,
* mln/level/to_enc.hh,
* mln/level/all.hh,
* mln/level/fast_median.hh,
* mln/level/approx/essential.hh,
* mln/level/approx/all.hh,
* mln/level/approx/median.hh,
* mln/level/replace.hh,
* mln/level/apply.spe.hh,
* mln/level/transform.hh,
* mln/level/stretch.hh,
* mln/level/compute.hh,
* mln/level/sort_psites.hh,
* mln/level/convert.hh,
* mln/level/sort_offsets.hh: Move to...
* mln/data/update.hh,
* mln/data/was.median.hh,
* mln/data/transform.spe.hh,
* mln/data/to_enc.hh,
* mln/data/transform.hh,
* mln/data/replace.hh,
* mln/data/approx/essential.hh,
* mln/data/approx/all.hh,
* mln/data/approx/median.hh,
* mln/data/apply.spe.hh,
* mln/data/stretch.hh,
* mln/data/sort_offsets.hh,
* mln/data/apply.hh,
* mln/data/compare.hh,
* mln/data/saturate.hh,
* mln/data/median.hh,
* mln/data/naive/essential.hh,
* mln/data/naive/all.hh,
* mln/data/naive/median.hh,
* mln/data/abs.hh,
* mln/data/transform_inplace.hh,
* mln/data/fast_median.hh,
* mln/data/compute.hh,
* mln/data/sort_psites.hh,
* mln/data/convert.hh: ...those new files.
Update.
* mln/data/all.hh,
* mln/data/essential.hh: Update.
* mln/level: Remove this directory.
* mln/all.hh: Update.
* tests/level/median.cc,
* tests/level/transform_full.cc,
* tests/level/compute_full.cc,
* tests/level/stretch_full.cc,
* tests/level/all_headers.cc,
* tests/level/abs.cc,
* tests/level/transform_inplace.cc,
* tests/level/apply_full.cc,
* tests/level/compare_full.cc,
* tests/level/median_fast.cc,
* tests/level/saturate_full.cc,
* tests/level/replace.cc,
* tests/level/transform.cc,
* tests/level/stretch.cc,
* tests/level/compute.cc,
* tests/level/naive,
* tests/level/naive/median.cc,
* tests/level/naive/Makefile.am,
* tests/level/sort_psites.cc,
* tests/level/convert.cc,
* tests/level/update.cc,
* tests/level/approx,
* tests/level/approx/median.cc,
* tests/level/approx/Makefile.am,
* tests/level/apply.cc,
* tests/level/compare.cc,
* tests/level/abs_full.cc,
* tests/level/saturate.cc: Move to...
* tests/data/transform_full.cc,
* tests/data/median.cc,
* tests/data/compute_full.cc,
* tests/data/all_headers.cc,
* tests/data/abs.cc,
* tests/data/transform_inplace.cc,
* tests/data/apply_full.cc,
* tests/data/median_fast.cc,
* tests/data/compute.cc,
* tests/data/sort_psites.cc,
* tests/data/convert.cc,
* tests/data/update.cc,
* tests/data/abs_full.cc,
* tests/data/stretch_full.cc,
* tests/data/compare_full.cc,
* tests/data/saturate_full.cc,
* tests/data/replace.cc,
* tests/data/transform.cc,
* tests/data/stretch.cc,
* tests/data/apply.cc,
* tests/data/compare.cc,
* tests/data/saturate.cc: ...those new files.
Update.
* tests/data/Makefile.am: Update.
* tests/Makefile.am: Update.
Propagate those renamings.
* trash/to_tiles.hh,
* trash/display_save.hh,
* trash/translate_image.cc,
* trash/display_color_pretty.cc,
* trash/save_and_show.cc,
* trash/to_tiles.cc,
* trash/display_color_pretty.hh,
* mln/trait/accumulators.hh,
* mln/debug/superpose.hh,
* mln/world/binary_2d/subsample.hh,
* mln/world/binary_2d/enlarge.hh,
* mln/core/image/imorph/labeled_image.hh,
* mln/core/concept/object.hh,
* mln/arith/min.hh,
* mln/arith/min.spe.hh,
* mln/arith/diff_abs.hh,
* mln/data/approx/essential.hh,
* mln/data/approx/all.hh,
* mln/data/approx/median.hh,
* mln/data/naive/essential.hh,
* mln/data/naive/all.hh,
* mln/data/naive/median.hh,
* mln/linear/sobel_2d.hh,
* mln/linear/gaussian.hh,
* mln/linear/gaussian/impl.hh,
* mln/transform/hough.hh,
* mln/estim/sum.hh,
* mln/estim/min_max.hh,
* mln/estim/mean.hh,
* mln/essential/routine.hh,
* mln/binarization/binarization.hh,
* mln/morpho/watershed/superpose.hh,
* mln/morpho/tree/compute_parent.hh,
* mln/morpho/tree/max.hh,
* mln/morpho/approx/dilation.hh,
* mln/morpho/plus.hh,
* mln/morpho/min.hh,
* mln/morpho/reconstruction/by_erosion/union_find.hh,
* mln/morpho/reconstruction/by_dilation/union_find.hh,
* mln/morpho/minus.hh,
* mln/morpho/complementation.hh,
* mln/morpho/Rd.hh,
* mln/morpho/includes.hh,
* mln/morpho/leveling_filter.hh,
* mln/morpho/algebraic_filter.hh,
* mln/logical/and.hh,
* mln/logical/and_not.hh,
* mln/logical/includes.hh,
* mln/logical/xor.hh,
* mln/logical/not.hh,
* mln/logical/or.hh,
* mln/canvas/morpho/attribute_filter.hh,
* mln/canvas/labeling.hh,
* mln/labeling/colorize.hh,
* mln/labeling/regional_minima.hh,
* mln/labeling/regional_maxima.hh,
* mln/labeling/mean_values.hh,
* mln/labeling/blobs.hh,
* mln/labeling/relabel.hh,
* mln/labeling/wrap.hh,
* mln/labeling/foreground.hh,
* mln/labeling/pack.hh,
* mln/labeling/background.hh,
* mln/util/tree_to_image.hh,
* tools/seed2tiling.cc,
* tests/topo/skeleton/crest.cc,
* tests/debug/iota.cc,
* tests/world/inter_pixel/compute.cc,
* tests/world/inter_pixel/immerse.cc,
* tests/world/inter_pixel/dim2/make_edge_image.cc,
* tests/world/inter_pixel/display_edge.cc,
* tests/world/binary_2d/enlarge.cc,
* tests/core/other/clock_test.cc,
* tests/core/image/sparse_image.cc,
* tests/core/image/obased_rle_image.cc,
* tests/core/image/value_enc_image.cc,
* tests/core/image/plain.cc,
* tests/core/image/dmorph/slice_image.cc,
* tests/core/image/fi_adaptor.cc,
* tests/core/image/mono_rle_image.cc,
* tests/core/image/rle_image.cc,
* tests/core/image/vmorph/cast_image.cc,
* tests/core/image/mono_obased_rle_image.cc,
* tests/draw/graph.cc,
* tests/draw/line.cc,
* tests/opt/at.cc,
* tests/transformation/rotate.cc,
* tests/arith/minus.cc,
* tests/arith/diff_abs.cc,
* tests/arith/times.cc,
* tests/arith/plus.cc,
* tests/arith/revert.cc,
* tests/data/fill_with_image.cc,
* tests/data/approx/median.cc,
* tests/data/paste_full.cc,
* tests/data/paste.cc,
* tests/data/naive/median.cc,
* tests/linear/convolve.cc,
* tests/linear/lap.cc,
* tests/linear/log.cc,
* tests/linear/convolve_directional.cc,
* tests/linear/convolve_2x1d.cc,
* tests/linear/sobel_2d.cc,
* tests/linear/gaussian.cc,
* tests/transform/distance_and_closest_point_geodesic.cc,
* tests/accu/transform_snake.cc,
* tests/accu/image/to_result.cc,
* tests/accu/image/take_n_times.cc,
* tests/accu/image/init.cc,
* tests/accu/image/take.cc,
* tests/accu/image/set_value.cc,
* tests/accu/image/untake.cc,
* tests/accu/image/take_as_init.cc,
* tests/accu/transform_diagonal.cc,
* tests/accu/transform.cc,
* tests/accu/nil.cc,
* tests/accu/transform_line.cc,
* tests/accu/min.cc,
* tests/accu/max.cc,
* tests/accu/line.cc,
* tests/accu/transform_directional.cc,
* tests/make/image3d.cc,
* tests/convert/to_image.cc,
* tests/geom/seed2tiling_roundness.cc,
* tests/geom/seed2tiling.cc,
* tests/fun/v2v/hsl_to_rgb.cc,
* tests/fun/v2v/rgb_to_hsl.cc,
* tests/binarization/threshold.cc,
* tests/morpho/artificial_line_graph_image_wst.cc,
* tests/morpho/watershed/flooding.cc,
* tests/morpho/watershed/superpose.cc,
* tests/morpho/closing/area.cc,
* tests/morpho/tree/compute_attribute_image.cc,
* tests/morpho/tree/filter/filter.cc,
* tests/morpho/tree/compute_parent.cc,
* tests/morpho/tree/max.cc,
* tests/morpho/tree/data.cc,
* tests/morpho/skeleton_constrained.cc,
* tests/morpho/reconstruction/by_erosion/union_find.cc,
* tests/morpho/reconstruction/by_dilation/union_find.cc,
* tests/morpho/rank_filter.cc,
* tests/morpho/lena_line_graph_image_wst2.cc,
* tests/io/pgm/pgm27.cc,
* tests/io/pgm/pgm19.cc,
* tests/io/pgm/pgm.cc,
* tests/io/pgm/pgm16.cc,
* tests/io/fits/fits.cc,
* tests/io/dump/dump.cc,
* tests/io/tiff/load.cc,
* tests/io/tiff/tiff2pbm.cc,
* tests/io/dicom/dicom.cc,
* tests/io/magick/save.cc,
* tests/io/magick/load.cc,
* tests/io/ppm/ppm.cc,
* tests/io/ppm/ppm23.cc,
* tests/io/ppm/ppm16.cc,
* tests/io/pbm/pbm.cc,
* tests/logical/not.cc,
* tests/logical/or.cc,
* tests/logical/and.cc,
* tests/logical/and_not.cc,
* tests/logical/xor.cc,
* tests/canvas/chamfer.cc,
* tests/canvas/browsing/snake_generic_2d_vert.cc,
* tests/canvas/browsing/snake_generic_2d_hori.cc,
* tests/canvas/browsing/snake_generic_3d_vert.cc,
* tests/canvas/browsing/diagonal2d.cc,
* tests/canvas/browsing/snake_generic_3d_hori.cc,
* tests/canvas/browsing/backdiagonal2d.cc,
* tests/labeling/mean_values.cc,
* tests/labeling/n_max.cc,
* tests/labeling/flat_zones.cc,
* tests/labeling/wrap.cc,
* tests/labeling/foreground.cc,
* tests/labeling/pack.cc,
* tests/labeling/Makefile.am,
* tests/labeling/colorize.cc,
* tests/util/tree_to_image.cc,
* tests/util/tree_fast_to_image.cc,
* apps/statues/mesh-max-curv.cc,
* apps/statues/mesh-complex-max-curv.cc,
* doc/benchmark/canvas.cc,
* doc/benchmark/median/median_bench.cc,
* doc/examples/trash/tuto_one.cc,
* doc/examples/trash/labeling_algo.cc,
* doc/examples/trash/tuto_bis.cc,
* doc/examples/trash/graph.cc,
* doc/examples/accu-right-instanciation.cc,
* doc/examples/extend.cc,
* doc/examples/tuto3/first_routine.cc: Propagate renamings.
2009-05-29 Guillaume Lazzara <lazzara@lrde.epita.fr>
 
Fix tutorial typos and issues.
......@@ -46,7 +46,7 @@
#include <mln/math/sqr.hh>
#include <mln/accu/min_max.hh>
#include <mln/fun/v2v/linear.hh>
#include <mln/level/transform.hh>
#include <mln/data/transform.hh>
#include <mln/literal/white.hh>
......@@ -140,7 +140,7 @@ int main(int argc, char* argv[])
ima_t output(max_curv.domain());
mln::data::fill(output, mln::literal::zero);
std::pair<float, float> min_max(acc);
// FIXME: Taken from mln/level/stretch.hh (this should be factored).
// FIXME: Taken from mln/data/stretch.hh (this should be factored).
float min = min_max.first;
float max = min_max.second;
std::cout << min << std::endl;
......@@ -154,7 +154,7 @@ int main(int argc, char* argv[])
float a = (M - m) / (max - min);
float b = (m * max - M * min) / (max - min);
mln::fun::v2v::linear<float, float, float> f(a, b);
output = mln::level::transform(max_curv, f);
output = mln::data::transform(max_curv, f);
}
// Output.
......
......@@ -96,7 +96,7 @@ int main(int argc, char* argv[])
OFF file format. */
std::vector<float> normalized_face_m(face_m.size(), 0.0f);
std::pair<float, float> min_max(acc);
// FIXME: Taken from mln/level/stretch.hh (this should be factored).
// FIXME: Taken from mln/data/stretch.hh (this should be factored).
float min = min_max.first;
float max = min_max.second;
// Don't normalize actually if the curvature is constant (i.e.,
......
......@@ -27,7 +27,7 @@
/// \file doc/benchmark/canvas.cc
///
/// Test on mln::labeling::level.
/// Test on mln::labeling::value.
#include <mln/core/image/image2d.hh>
#include <mln/core/alias/neighb2d.hh>
......@@ -253,7 +253,7 @@ namespace mln
level(const Image<I>& input, const mln_value(I)& val, const Neighborhood<N>& nbh,
L& nlabels)
{
trace::entering("labeling::level");
trace::entering("labeling::value");
typedef level_functor<I,N,L> F;
F f(exact(input), val, exact(nbh));
......@@ -261,7 +261,7 @@ namespace mln
nlabels = run.nlabels;
trace::exiting("labeling::level");
trace::exiting("labeling::value");
return run.output;
}
......@@ -285,7 +285,7 @@ int main()
t.start();
unsigned n;
for (unsigned l = 0; l <= 255; ++l)
old_labeling::level(lena, l, c4(), n);
old_labeling::value(lena, l, c4(), n);
std::cout << "canvas as class: " << t.read() << std::endl;
}
......@@ -294,7 +294,7 @@ int main()
t.start();
unsigned n;
for (unsigned l = 0; l <= 255; ++l)
labeling::impl::generic::level(lena, l, c4(), n);
labeling::impl::generic::data(lena, l, c4(), n);
std::cout << "canvas as proc.: " << t.read() << std::endl;
}
......
......@@ -38,9 +38,9 @@
#include <mln/debug/iota.hh>
#include <mln/debug/println.hh>
#include <mln/level/approx/median.hh>
#include <mln/level/fast_median.hh>
#include <mln/level/median.hh>
#include <mln/data/approx/median.hh>
#include <mln/data/fast_median.hh>
#include <mln/data/median.hh>
#include <mln/core/dpoints_pixter.hh>
#include <mln/core/pixel.hh>
......@@ -88,17 +88,17 @@ void tests(const Image<I>& input, const Window<W>& win,
timer chrono;
chrono.start();
level::fast_median(input, win, output);
data::fast_median(input, win, output);
chrono.stop();
std::cout << "Fast median : " << chrono << std::endl;
chrono.start();
level::median(input, win, output);
data::median(input, win, output);
chrono.stop();
std::cout << "Median : " << chrono << std::endl;
chrono.start();
level::approx::median(input, exact(win), output);
data::approx::median(input, exact(win), output);
chrono.stop();
std::cout << "Approx median : " << chrono << std::endl;
......
......@@ -2,7 +2,7 @@
#include <mln/value/int_u8.hh>
#include <mln/level/compute.hh>
#include <mln/data/compute.hh>
#include <mln/accu/max.hh>
......@@ -13,6 +13,6 @@ int main()
image2d<value::int_u8> ima(2, 3);
// \{
level::compute(accu::meta::max(), ima);
data::compute(accu::meta::max(), ima);
// \}
}
......@@ -3,7 +3,7 @@
#include <mln/core/routine/extend.hh>
#include <mln/core/var.hh>
#include <mln/level/transform.hh>
#include <mln/data/transform.hh>
#include <mln/fun/p2b/big_chess.hh>
......@@ -97,7 +97,7 @@ int main()
initialize(mask, lena);
data::fill(mask, true);
data::fill((mask | ima_roi.domain()).rw(), false);
mln_VAR(ima_ext, level::transform(lena | (pw::value(mask) != false), saturate_rgb8()));
mln_VAR(ima_ext, data::transform(lena | (pw::value(mask) != false), saturate_rgb8()));
data::paste(ima_ext, lena);
data::paste(ima_roi, lena);
doc::ppmsave(lena, "extend");
......
......@@ -100,7 +100,7 @@ int main(int argc, char *argv[])
p_vertices<G, fv2p_t> pv(g, fv2p);
#ifndef NOUT
image2d<rgb8> gima = level::convert(rgb8(), ima);
image2d<rgb8> gima = data::convert(rgb8(), ima);
debug::draw_graph(gima,
pv,
pw::cst(literal::cyan),
......@@ -123,7 +123,7 @@ int main(int argc, char *argv[])
pvlg_t pvlg(lg, convert::to<i2e_t>(lines));
#ifndef NOUT
image2d<rgb8> lgima = level::convert(rgb8(), ima);
image2d<rgb8> lgima = data::convert(rgb8(), ima);
debug::draw_graph(lgima,
pvlg,
pw::cst(literal::cyan),
......@@ -154,7 +154,7 @@ int main(int argc, char *argv[])
#ifndef NOUT
image2d<rgb8> lgima2 = level::convert(rgb8(), ima);
image2d<rgb8> lgima2 = data::convert(rgb8(), ima);
debug::draw_graph(lgima2, pvlg, pw::cst(literal::cyan), ecolor);
io::ppm::save(lgima2, "05-line-graph-cleanup.ppm");
#endif
......
......@@ -34,7 +34,7 @@
# include <mln/core/alias/neighb2d.hh>
# include <mln/value/int_u8.hh>
# include <mln/data/fill.hh>
# include <mln/level/stretch.hh>
# include <mln/data/stretch.hh>
# include <mln/border/fill.hh>
# include <mln/io/pbm/load.hh>
# include <mln/io/pgm/save.hh>
......@@ -68,7 +68,7 @@ int main()
image2d<int_u8> inte2(inte.domain());
level::stretch(inte, inte2);
data::stretch(inte, inte2);
io::pgm::save(inte2, "inte.pgm");
......
......@@ -20,7 +20,7 @@
# include <mln/data/paste.hh>
# include <mln/data/fill.hh>
# include <mln/level/transform.hh>
# include <mln/data/transform.hh>
# include <mln/extension/fill.hh>
# include <mln/morpho/meyer_wst.hh>
......@@ -263,7 +263,7 @@ int main()
for (unsigned i = 1; i <= nbasins; ++i)
std::cout << "mean value of basin #" << i << " is " << m(i) << std::endl;
// data::fill(cell, level::transform(lab, m));
// data::fill(cell, data::transform(lab, m));
// debug::println(cell);
// // 2 2 2
// //
......
......@@ -11,7 +11,7 @@
# include <mln/core/alias/neighb2d.hh>
# include <mln/make/double_neighb2d.hh>
# include <mln/level/transform.hh>
# include <mln/data/transform.hh>
# include <mln/literal/black.hh>
# include <mln/debug/println.hh>
......@@ -79,7 +79,7 @@ void do_it(const I& ima,
debug::println(labeling::regional_minima(clo, nbh, l));
debug::println(wst);
io::ppm::save(level::transform(wst, colorize(l)), filename);
io::ppm::save(data::transform(wst, colorize(l)), filename);
}
......
......@@ -10,7 +10,7 @@
#include <mln/labeling/compute.hh>
#include <mln/labeling/blobs.hh>
#include <mln/level/compare.hh>
#include <mln/data/compare.hh>
#include <mln/util/array.hh>
......
......@@ -26,8 +26,8 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
#ifndef MLN_ALL_HH_
# define MLN_ALL_HH_
#ifndef MLN_ALL_HH
# define MLN_ALL_HH
/// \file mln/all.hh
///
......@@ -53,7 +53,6 @@
#include <mln/histo/all.hh>
#include <mln/io/all.hh>
#include <mln/labeling/all.hh>
#include <mln/level/all.hh>
#include <mln/linear/all.hh>
#include <mln/literal/all.hh>
#include <mln/logical/all.hh>
......@@ -78,5 +77,4 @@
#include <mln/essential/2d.hh>
#include <mln/essential/3d.hh>
#endif // ! MLN_ALL_HH_
#endif // ! MLN_ALL_HH
......@@ -37,7 +37,7 @@
# include <mln/arith/includes.hh>
# include <mln/fun/vv2v/diff_abs.hh>
# include <mln/level/transform.hh>
# include <mln/data/transform.hh>
namespace mln
{
......@@ -70,7 +70,7 @@ namespace mln
mln_precondition(exact(rhs).is_valid());
mln_precondition(exact(rhs).domain() == exact(lhs).domain());
mln_concrete(I) output = level::transform(lhs, rhs, fun::vv2v::diff_abs<mln_value(I)>());
mln_concrete(I) output = data::transform(lhs, rhs, fun::vv2v::diff_abs<mln_value(I)>());
trace::exiting("arith::diff_abs");
return output;
......
......@@ -80,27 +80,27 @@ namespace mln
inline
void min_(const L& lhs, const R& rhs, O& output)
{
trace::entering("level::arith::generic::min_");
trace::entering("data::arith::generic::min_");
mln_piter(L) p(lhs.domain());
for_all(p)
output(p) = lhs(p) < rhs(p) ? lhs(p) : rhs(p);
trace::entering("level::arith::generic::min_");
trace::entering("data::arith::generic::min_");
}