https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox Index: ChangeLog from Thierry Geraud <thierry.geraud@lrde.epita.fr> Updating level/ to data/ and labeling::level to ::value. * duhamel/labeling_level_generic_10000x1000.cc, * duhamel/slow_seed2tiling.cc, * duhamel/labeling_algo.cc, * duhamel/level.hh, * duhamel/main.cc, * duhamel/paste.hh, * duhamel/labeling_level_fast.cc, * duhamel/canvas_labeling.hh, * duhamel/level_cpy_from_mln.hh, * duhamel/mem.hh, * duhamel/fill.hh, * duhamel/abr_to_image.cc, * duhamel/labeling_cpy_from_mln.hh, * duhamel/labeling.hh, * levillain/morpho/shortest_path_watershed.hh, * fred/old/accuprops.cc, * fred/old/leveling.cc, * fred/old/algebraic.cc, * fred/old/accuprops2.cc, * fred/old/leveling_filter.hh, * fred/old/accu_trait.hh, * igr/code/test.cc, * icdar/2009/dibco/quasi.cc, * icdar/2009/dibco/svg.1.binarization.cc, * icdar/2009/dibco/svg.2.binarization.cc, * icdar/2009/dibco/svg.3.binarization.cc, * icdar/2009/dibco/binarization.cc, * icdar/2009/hsc/icdar2ppm.hh, * icdar/2009/hsc/icdar_io.cc, * icdar/2009/hsc/clean_input.hh, * icdar/2009/hsc/lines_to_boxes.cc, * icdar/2009/hsc/first_attempts/exec/iz_lines.cc, * icdar/2009/hsc/first_attempts/exec/relabel_lines.cc, * icdar/2009/hsc/first_attempts/boxes.cc, * icdar/2009/hsc/first_attempts/main.cc, * icdar/2009/hsc/input_to_ws.hh, * icdar/2009/hsc/old_input_to_lines.cc, * icdar/2009/hsc/lines_to_words.cc, * icdar/2009/hsc/ws_to_wsl.hh, * nivault/plugin-gimp/src/build-image.hh, * nivault/extract_score.cc, * nivault/extract_character.cc, * nivault/median.hh, * exec/bw_negate_in_color.cc, * fabien/igr/time_max_norm.cc, * fabien/igr/smooth_fixed_seg/main.cc, * fabien/igr/time_max.cc, * fabien/igr/fun_labels.cc, * fabien/igr/norm.cc, * fabien/igr/watershed2d.cc, * fabien/igr/watershed3d.cc, * fabien/igr/min_max_float.cc, * fabien/igr/seg_vol_irm.hh, * fabien/igr/wst_edges.cc, * fabien/igr/mat2mln/raw2mlndata.cc, * fabien/igr/mat2mln/mat2mln.cc, * fabien/igr/label2gif.cc, * fabien/igr/plot_label.hh, * fabien/igr/space_smooth/morpho.cc, * fabien/igr/watershed.hh, * fabien/igr/matlab.cc, * fabien/igr/graph.cc, * fabien/igr/time_smooth/morpho.cc, * fabien/igr/med.cc, * fabien/igr/fixed_seg/main.cc, * fabien/igr/dist_edges.cc, * fabien/igr/igr.cc, * fabien/igr/mean_slices.cc, * fabien/igr/nbasins_finder.cc, * fabien/igr/filter.cc, * fabien/level.hh, * fabien/regional_minima.hh, * fabien/bin/dump_mask.cc, * fabien/bin/dicom_mask.cc, * fabien/bin/dumpi12_to_pgm.cc, * fabien/binarization/test.cc, * fabien/regional_maxima.hh, * fabien/labeling.hh, * fabien/level.cc, * jardonnet/n_cmpt/tikz.hh, * jardonnet/n_cmpt/nwst.hh, * jardonnet/n_cmpt/test_attribute_watershed.cc, * jardonnet/n_cmpt/fused_filter.cc, * jardonnet/n_cmpt/n_cmpt2.hh, * jardonnet/n_cmpt/n_cmpt3.hh, * jardonnet/n_cmpt/n_cmpt4.hh, * jardonnet/n_cmpt/n_cmpt5.hh, * jardonnet/n_cmpt/ref_filter.cc, * jardonnet/n_cmpt/n_cmpt.hh, * jardonnet/igr/src/igr.cc, * dalila/plop.cc, * garrigues/level_set.hh, * garrigues/fllt/fllt_simple.svg.3.cc, * garrigues/fllt/fllt_simple.cc, * garrigues/fllt/compute_level_set_fast2.hh, * garrigues/fllt/fllt_optimized.hh, * garrigues/fllt/debug.hh, * garrigues/fllt/compute_level_set_fast.hh, * garrigues/fllt/fllt.hh, * garrigues/fllt/give_confs.cc, * garrigues/fllt/compute_level_set.hh, * garrigues/union_find/reconstructions_on_function.hh, * garrigues/union_find/reconstructions_on_set.hh, * garrigues/union_find/self_dual_reconstruction.hh, * garrigues/factures/extract_array_highlight.cc, * garrigues/factures/extract_array.cc, * abraham/tests/morpho/test_watershed.cc, * abraham/tests/morpho/test_watershed_topo.cc, * abraham/mln/morpho/najman_wst.hh, * abraham/mln/morpho/basic_najman.hh, * abraham/mln/morpho/topo_wst.hh, * abraham/mln/level/thru.hh, * inim/2010/boxes/boxes.cc, * inim/2010/morpho/main_dilation-n.cc, * inim/2010/morpho/morpho.cc, * inim/2010/rag/rag.hh, * inim/2010/cag/superpose.hh, * inim/2011/fredwin/inim.cc, * inim/2009/classif/src/max_tree.hh, * inim/2009/classif/src/iccvg04.cc, * inim/2009/binarization/snake2d.cc, * inim/2009/color/min_tree_volume_filter.cc, * inim/2009/color/reference.cc, * inim/2009/color/min_tree_area_filter.cc, * inim/2009/color/min_tree_height_filter.cc, * inim/2009/color/min_tree_color.cc, * inim/2009/color/reference2.cc, * inim/2009/color/min_tree_color_v2.cc, * inim/2009/nature/nature.cc, * inim/2009/nature/hom.cc, * inim/2009/nature/histo_hsi.cc, * theo/igr/irm_seg_with_mm_and_rag.cc, * theo/igr/irm_anat_segm.cc, * theo/igr/irm_anat_segm__2D_ONLY.cc, * theo/igr/segment_2d_t.cc, * theo/igr/dump_to_dist.cc, * theo/rush/exo2/exo2.cc, * theo/rush/exo3/exo3_fun_generator.cc, * theo/rush/exo3/exo3_fun_area.cc, * theo/exec/diff_abs.cc, * theo/exec/gaussian_directional_2d__float.cc, * theo/exec/watershed_flooding.cc, * theo/exec/dump_12bit_to_pgm.cc, * theo/exec/color_labeling_mean.cc, * theo/exec/gaussian_directional_2d.cc, * theo/exec/distance_thick.cc, * theo/test_attribute.cc, * theo/fllt.svg.6.cc, * theo/esiee/laurent/presentation/wst_edge.cc, * theo/esiee/laurent/presentation/wst2d.cc, * theo/esiee/laurent/presentation/wst3d.cc, * theo/esiee/laurent/presentation/segmentation.hh, * theo/esiee/laurent/ismm09/trash.hh, * theo/esiee/laurent/ismm09/extinct_attributes.hh, * theo/esiee/laurent/ismm09/main.ext.cc, * theo/esiee/laurent/ismm09/main.cc, * theo/esiee/laurent/ismm09/util.hh, * theo/esiee/laurent/ismm09/pseudo_tree.hh, * theo/cs2d/cs2d.cc, * theo/cs2d/kruskal.cc, * theo/cs2d/cs2d_morpho.hh, * theo/publis/icip2009/compute_a.cc, * theo/publis/icip2009/regmin_count.cc, * theo/fllt/fllt.hh, * theo/fllt/fllt.svg.7.hh, * theo/fllt/fllt.svg.4.cc, * theo/fllt/fllt.svg.5.cc, * theo/fllt/fllt.svg.6.cc, * theo/fllt/fllt_test.hh, * theo/fllt.svg.7.hh, * theo/dmap.cc, * theo/Rd/diff.cc, * theo/Rd/utils.hh, * theo/Rd/diff_pgm.cc, * theo/tufa_2008/steps.0.cc, * theo/tufa_2008/steps.1.cc, * theo/tufa_2008/steps.2.cc, * theo/tufa_2008/steps.3.cc, * theo/tufa_2008/steps.2b.cc, * theo/tufa_2008/filter_n.cc, * theo/tufa_2008/wst_f_equal_wst_a.cc, * theo/tufa_2008/wst.cc, * theo/tufa_2008/experiment.cc, * theo/tufa_2008/n_cmpt.cc, * theo/tufa_2008/filter.cc, * theo/tufa_2008/fz_count.cc, * theo/color/segment.hh, * theo/color/segment_rgb_pixels.cc, * theo/color/segment_rgb_edges.cc, * theo/color/change_attributes.hh, * theo/color/filter_blen_rgb_edges.cc, * theo/color/filter_meandist_rgb_pixels.cc, * theo/color/segment_gl_pixels.cc, * theo/csi/edwin.cc, * bugs/lut.cc, * lazzara/igr/irm_seg_with_mm_and_rag.mine.cc, * lazzara/igr/igr-biggest-comp.cc, * lazzara/igr/irm/wst_rag_hsl.cc, * lazzara/igr/irm/grad_clo_and_wshd.cc, * lazzara/igr/irm/hsl_grad_and_wst.cc, * lazzara/igr/irm/wst_rag.cc, * edwin/tree/tree.cc, * edwin/tree/propagation.cc, * edwin/rush/leaves/test/export.cc, * edwin/rush/leaves/get_leaves.cc, * edwin/rush/granulometry/test.cc, * edwin/rush/exo2/wst_from_closing.cc, * edwin/rush/exo2/test.cc, * edwin/rush/exo2/wst_from_tree.cc, * edwin/rush/exo2/color_labeling_mean.hh, * edwin/tests/sharp.cc, * camille/graph-wst.cc, * camille/graph-line-gradient-closing.cc, * vigouroux/convert/stretch.hh, * vigouroux/yuv/test.cc, * vigouroux/yuv/testfun.cc, * vigouroux/cmy/test.cc, * vigouroux/cmy/testfun.cc, * vigouroux/xyz/test.cc, * vigouroux/xyz/testfun.cc, * vigouroux/moyenne.cc, * vigouroux/lap.cc, * vigouroux/yiq/test.cc, * vigouroux/yiq/testfun.cc, * vigouroux/load.cc, * vigouroux/conv/test.cc, * vigouroux/testfun.cc, * folio/test/histo/compute_histo_rgb_from_ppm.cc, * folio/test/histo/projected3d.cc, * folio/test/histo/classify_with_histo_rgb.cc, * folio/test/dt/psn.cc, * folio/test/dt/psn_log.cc, * folio/test/dt/dt_maze.cc, * folio/test/dt/chamfer.cc, * folio/test/dt/dt_bench.cc, * folio/test/dt/dt.cc, * folio/test/value/hsv.cc, * folio/mln/dt/dt_old/psn.cc, * folio/mln/dt/dt_old/psn_log.cc, * folio/mln/dt/dt_old/distance_front.cc, * folio/mln/dt/dt_old/chamfer.cc, * folio/mln/dt/dt_old/dt.cc, * beguin/irm_g.cc, * beguin/segm_to_pregraph.hh, * beguin/irm.cc, * laurent/ismm2009.cc, * laurent/playing_with_attributes.cc, * delmon/minsurf/main.cc (level): Update to data. (labeling::level): Update to labeling::value. abraham/mln/level/thru.hh | 22 +++++++-------- abraham/mln/morpho/basic_najman.hh | 6 ++-- abraham/mln/morpho/najman_wst.hh | 6 ++-- abraham/mln/morpho/topo_wst.hh | 4 +- abraham/tests/morpho/test_watershed.cc | 2 - abraham/tests/morpho/test_watershed_topo.cc | 2 - beguin/irm.cc | 14 +++++----- beguin/irm_g.cc | 8 ++--- beguin/segm_to_pregraph.hh | 2 - bugs/lut.cc | 8 ++--- camille/graph-line-gradient-closing.cc | 2 - camille/graph-wst.cc | 2 - dalila/plop.cc | 4 +- delmon/minsurf/main.cc | 4 +- duhamel/abr_to_image.cc | 4 +- duhamel/canvas_labeling.hh | 2 - duhamel/fill.hh | 2 - duhamel/labeling.hh | 2 - duhamel/labeling_algo.cc | 4 +- duhamel/labeling_cpy_from_mln.hh | 2 - duhamel/labeling_level_fast.cc | 2 - duhamel/labeling_level_generic_10000x1000.cc | 2 - duhamel/level.hh | 6 ++-- duhamel/level_cpy_from_mln.hh | 6 ++-- duhamel/main.cc | 2 - duhamel/mem.hh | 2 - duhamel/paste.hh | 2 - duhamel/slow_seed2tiling.cc | 8 ++--- edwin/rush/exo2/color_labeling_mean.hh | 4 +- edwin/rush/exo2/test.cc | 4 +- edwin/rush/exo2/wst_from_closing.cc | 4 +- edwin/rush/exo2/wst_from_tree.cc | 12 ++++---- edwin/rush/granulometry/test.cc | 4 +- edwin/rush/leaves/get_leaves.cc | 4 +- edwin/rush/leaves/test/export.cc | 4 +- edwin/tests/sharp.cc | 8 ++--- edwin/tree/propagation.cc | 4 +- edwin/tree/tree.cc | 8 ++--- exec/bw_negate_in_color.cc | 2 - fabien/bin/dicom_mask.cc | 4 +- fabien/bin/dump_mask.cc | 4 +- fabien/bin/dumpi12_to_pgm.cc | 6 ++-- fabien/binarization/test.cc | 8 ++--- fabien/igr/dist_edges.cc | 10 +++---- fabien/igr/filter.cc | 14 +++++----- fabien/igr/fixed_seg/main.cc | 18 ++++++------ fabien/igr/fun_labels.cc | 12 ++++---- fabien/igr/graph.cc | 10 +++---- fabien/igr/igr.cc | 10 +++---- fabien/igr/label2gif.cc | 6 ++-- fabien/igr/mat2mln/mat2mln.cc | 4 +- fabien/igr/mat2mln/raw2mlndata.cc | 4 +- fabien/igr/matlab.cc | 6 ++-- fabien/igr/mean_slices.cc | 2 - fabien/igr/med.cc | 6 ++-- fabien/igr/min_max_float.cc | 4 +- fabien/igr/nbasins_finder.cc | 8 ++--- fabien/igr/norm.cc | 6 ++-- fabien/igr/plot_label.hh | 4 +- fabien/igr/seg_vol_irm.hh | 24 ++++++++--------- fabien/igr/smooth_fixed_seg/main.cc | 18 ++++++------ fabien/igr/space_smooth/morpho.cc | 6 ++-- fabien/igr/time_max.cc | 8 ++--- fabien/igr/time_max_norm.cc | 8 ++--- fabien/igr/time_smooth/morpho.cc | 6 ++-- fabien/igr/watershed.hh | 28 ++++++++++---------- fabien/igr/watershed2d.cc | 28 ++++++++++---------- fabien/igr/watershed3d.cc | 28 ++++++++++---------- fabien/igr/wst_edges.cc | 6 ++-- fabien/labeling.hh | 12 ++++---- fabien/level.cc | 4 +- fabien/level.hh | 8 ++--- fabien/regional_maxima.hh | 2 - fabien/regional_minima.hh | 2 - folio/mln/dt/dt_old/chamfer.cc | 4 +- folio/mln/dt/dt_old/distance_front.cc | 2 - folio/mln/dt/dt_old/dt.cc | 4 +- folio/mln/dt/dt_old/psn.cc | 4 +- folio/mln/dt/dt_old/psn_log.cc | 4 +- folio/test/dt/chamfer.cc | 4 +- folio/test/dt/dt.cc | 2 - folio/test/dt/dt_bench.cc | 4 +- folio/test/dt/dt_maze.cc | 2 - folio/test/dt/psn.cc | 4 +- folio/test/dt/psn_log.cc | 4 +- folio/test/histo/classify_with_histo_rgb.cc | 4 +- folio/test/histo/compute_histo_rgb_from_ppm.cc | 2 - folio/test/histo/projected3d.cc | 10 +++---- folio/test/value/hsv.cc | 6 ++-- fred/old/accu_trait.hh | 2 - fred/old/accuprops.cc | 16 +++++------ fred/old/accuprops2.cc | 16 +++++------ fred/old/algebraic.cc | 12 ++++---- fred/old/leveling.cc | 6 ++-- fred/old/leveling_filter.hh | 26 +++++++++--------- garrigues/factures/extract_array.cc | 4 +- garrigues/factures/extract_array_highlight.cc | 6 ++-- garrigues/fllt/compute_level_set.hh | 6 ++-- garrigues/fllt/compute_level_set_fast.hh | 6 ++-- garrigues/fllt/compute_level_set_fast2.hh | 6 ++-- garrigues/fllt/debug.hh | 2 - garrigues/fllt/fllt.hh | 6 ++-- garrigues/fllt/fllt_optimized.hh | 6 ++-- garrigues/fllt/fllt_simple.cc | 2 - garrigues/fllt/fllt_simple.svg.3.cc | 2 - garrigues/fllt/give_confs.cc | 4 +- garrigues/level_set.hh | 12 ++++---- garrigues/union_find/reconstructions_on_function.hh | 8 ++--- garrigues/union_find/reconstructions_on_set.hh | 2 - garrigues/union_find/self_dual_reconstruction.hh | 8 ++--- icdar/2009/dibco/binarization.cc | 22 +++++++-------- icdar/2009/dibco/quasi.cc | 8 ++--- icdar/2009/dibco/svg.1.binarization.cc | 6 ++-- icdar/2009/dibco/svg.2.binarization.cc | 14 +++++----- icdar/2009/dibco/svg.3.binarization.cc | 16 +++++------ icdar/2009/hsc/clean_input.hh | 4 +- icdar/2009/hsc/first_attempts/boxes.cc | 2 - icdar/2009/hsc/first_attempts/exec/iz_lines.cc | 2 - icdar/2009/hsc/first_attempts/exec/relabel_lines.cc | 4 +- icdar/2009/hsc/first_attempts/main.cc | 8 ++--- icdar/2009/hsc/icdar2ppm.hh | 4 +- icdar/2009/hsc/icdar_io.cc | 2 - icdar/2009/hsc/input_to_ws.hh | 10 +++---- icdar/2009/hsc/lines_to_boxes.cc | 4 +- icdar/2009/hsc/lines_to_words.cc | 4 +- icdar/2009/hsc/old_input_to_lines.cc | 8 ++--- icdar/2009/hsc/ws_to_wsl.hh | 8 ++--- igr/code/test.cc | 2 - inim/2009/binarization/snake2d.cc | 2 - inim/2009/classif/src/iccvg04.cc | 2 - inim/2009/classif/src/max_tree.hh | 4 +- inim/2009/color/min_tree_area_filter.cc | 6 ++-- inim/2009/color/min_tree_color.cc | 6 ++-- inim/2009/color/min_tree_color_v2.cc | 4 +- inim/2009/color/min_tree_height_filter.cc | 4 +- inim/2009/color/min_tree_volume_filter.cc | 4 +- inim/2009/color/reference.cc | 4 +- inim/2009/color/reference2.cc | 4 +- inim/2009/nature/histo_hsi.cc | 14 +++++----- inim/2009/nature/hom.cc | 2 - inim/2009/nature/nature.cc | 8 ++--- inim/2010/boxes/boxes.cc | 4 +- inim/2010/cag/superpose.hh | 4 +- inim/2010/morpho/main_dilation-n.cc | 8 ++--- inim/2010/morpho/morpho.cc | 8 ++--- inim/2010/rag/rag.hh | 2 - inim/2011/fredwin/inim.cc | 10 +++---- jardonnet/igr/src/igr.cc | 6 ++-- jardonnet/n_cmpt/fused_filter.cc | 6 ++-- jardonnet/n_cmpt/n_cmpt.hh | 4 +- jardonnet/n_cmpt/n_cmpt2.hh | 4 +- jardonnet/n_cmpt/n_cmpt3.hh | 4 +- jardonnet/n_cmpt/n_cmpt4.hh | 4 +- jardonnet/n_cmpt/n_cmpt5.hh | 4 +- jardonnet/n_cmpt/nwst.hh | 2 - jardonnet/n_cmpt/ref_filter.cc | 6 ++-- jardonnet/n_cmpt/test_attribute_watershed.cc | 2 - jardonnet/n_cmpt/tikz.hh | 8 ++--- laurent/ismm2009.cc | 4 +- laurent/playing_with_attributes.cc | 8 ++--- lazzara/igr/igr-biggest-comp.cc | 4 +- lazzara/igr/irm/grad_clo_and_wshd.cc | 4 +- lazzara/igr/irm/hsl_grad_and_wst.cc | 12 ++++---- lazzara/igr/irm/wst_rag.cc | 6 ++-- lazzara/igr/irm/wst_rag_hsl.cc | 8 ++--- lazzara/igr/irm_seg_with_mm_and_rag.mine.cc | 14 +++++----- levillain/morpho/shortest_path_watershed.hh | 4 +- nivault/extract_character.cc | 10 +++---- nivault/extract_score.cc | 12 ++++---- nivault/median.hh | 8 ++--- nivault/plugin-gimp/src/build-image.hh | 2 - theo/Rd/diff.cc | 2 - theo/Rd/diff_pgm.cc | 2 - theo/Rd/utils.hh | 2 - theo/color/change_attributes.hh | 4 +- theo/color/filter_blen_rgb_edges.cc | 6 ++-- theo/color/filter_meandist_rgb_pixels.cc | 4 +- theo/color/segment.hh | 8 ++--- theo/color/segment_gl_pixels.cc | 4 +- theo/color/segment_rgb_edges.cc | 2 - theo/color/segment_rgb_pixels.cc | 4 +- theo/cs2d/cs2d.cc | 2 - theo/cs2d/cs2d_morpho.hh | 8 ++--- theo/cs2d/kruskal.cc | 4 +- theo/csi/edwin.cc | 4 +- theo/dmap.cc | 4 +- theo/esiee/laurent/ismm09/extinct_attributes.hh | 2 - theo/esiee/laurent/ismm09/main.cc | 2 - theo/esiee/laurent/ismm09/main.ext.cc | 2 - theo/esiee/laurent/ismm09/pseudo_tree.hh | 8 ++--- theo/esiee/laurent/ismm09/trash.hh | 2 - theo/esiee/laurent/ismm09/util.hh | 4 +- theo/esiee/laurent/presentation/segmentation.hh | 2 - theo/esiee/laurent/presentation/wst2d.cc | 4 +- theo/esiee/laurent/presentation/wst3d.cc | 4 +- theo/esiee/laurent/presentation/wst_edge.cc | 6 ++-- theo/exec/color_labeling_mean.cc | 8 ++--- theo/exec/diff_abs.cc | 4 +- theo/exec/distance_thick.cc | 4 +- theo/exec/dump_12bit_to_pgm.cc | 4 +- theo/exec/gaussian_directional_2d.cc | 6 ++-- theo/exec/gaussian_directional_2d__float.cc | 6 ++-- theo/exec/watershed_flooding.cc | 4 +- theo/fllt.svg.6.cc | 2 - theo/fllt.svg.7.hh | 2 - theo/fllt/fllt.hh | 6 ++-- theo/fllt/fllt.svg.4.cc | 2 - theo/fllt/fllt.svg.5.cc | 2 - theo/fllt/fllt.svg.6.cc | 2 - theo/fllt/fllt.svg.7.hh | 2 - theo/fllt/fllt_test.hh | 2 - theo/igr/dump_to_dist.cc | 4 +- theo/igr/irm_anat_segm.cc | 4 +- theo/igr/irm_anat_segm__2D_ONLY.cc | 4 +- theo/igr/irm_seg_with_mm_and_rag.cc | 8 ++--- theo/igr/segment_2d_t.cc | 6 ++-- theo/publis/icip2009/compute_a.cc | 8 ++--- theo/publis/icip2009/regmin_count.cc | 4 +- theo/rush/exo2/exo2.cc | 4 +- theo/rush/exo3/exo3_fun_area.cc | 4 +- theo/rush/exo3/exo3_fun_generator.cc | 4 +- theo/test_attribute.cc | 14 +++++----- theo/tufa_2008/experiment.cc | 16 +++++------ theo/tufa_2008/filter.cc | 6 ++-- theo/tufa_2008/filter_n.cc | 4 +- theo/tufa_2008/fz_count.cc | 4 +- theo/tufa_2008/n_cmpt.cc | 4 +- theo/tufa_2008/steps.0.cc | 8 ++--- theo/tufa_2008/steps.1.cc | 8 ++--- theo/tufa_2008/steps.2.cc | 6 ++-- theo/tufa_2008/steps.2b.cc | 6 ++-- theo/tufa_2008/steps.3.cc | 6 ++-- theo/tufa_2008/wst.cc | 2 - theo/tufa_2008/wst_f_equal_wst_a.cc | 10 +++---- vigouroux/cmy/test.cc | 6 ++-- vigouroux/cmy/testfun.cc | 6 ++-- vigouroux/conv/test.cc | 6 ++-- vigouroux/convert/stretch.hh | 4 +- vigouroux/lap.cc | 4 +- vigouroux/load.cc | 2 - vigouroux/moyenne.cc | 6 ++-- vigouroux/testfun.cc | 6 ++-- vigouroux/xyz/test.cc | 6 ++-- vigouroux/xyz/testfun.cc | 6 ++-- vigouroux/yiq/test.cc | 6 ++-- vigouroux/yiq/testfun.cc | 6 ++-- vigouroux/yuv/test.cc | 6 ++-- vigouroux/yuv/testfun.cc | 6 ++-- 248 files changed, 744 insertions(+), 744 deletions(-) Index: duhamel/labeling_level_generic_10000x1000.cc --- duhamel/labeling_level_generic_10000x1000.cc (revision 3923) +++ duhamel/labeling_level_generic_10000x1000.cc (working copy) @@ -57,7 +57,7 @@ unsigned n; image2d_b<value::int_u8> out(i1.domain(), border); - labeling::level(i1, 2, c4(), out, n); + labeling::value(i1, 2, c4(), out, n); mln_assertion (n == 1); } Index: duhamel/slow_seed2tiling.cc --- duhamel/slow_seed2tiling.cc (revision 3923) +++ duhamel/slow_seed2tiling.cc (working copy) @@ -36,7 +36,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> @@ -129,14 +129,14 @@ inte = geom::slow_seeds2tiling(lab, max); border::fill (inte, 0); - level::stretch (inte, inte2); + data::stretch (inte, inte2); io::pgm::save(inte2, "ima_slow.pgm"); std::cout << "ima_slow generate with seeds2tiling" << std::endl; inte = geom::seeds2tiling(lab, c4 ()); border::fill (inte, 0); - level::stretch (inte, inte2); + data::stretch (inte, inte2); io::pgm::save(inte2, "ima1.pgm"); std::cout << "ima1 generate with seeds2tiling" << std::endl; @@ -146,7 +146,7 @@ // << std::endl; // inte = geom::seeds2tiling_with_chamfer(lab, w_win, max, c4 ()); // border::fill (inte, 0); -// level::stretch (inte, inte2); +// data::stretch (inte, inte2); // io::pgm::save(inte2, "ima2.pgm"); // std::cout << "ima2 generate with seeds2tiling_with_chamfer" Index: duhamel/labeling_algo.cc --- duhamel/labeling_algo.cc (revision 3923) +++ duhamel/labeling_algo.cc (working copy) @@ -35,7 +35,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> @@ -71,7 +71,7 @@ image2d_b<int_u8> inte2(inte.domain()); - level::stretch (inte, inte2); + data::stretch (inte, inte2); io::pgm::save(inte2, "inte.pgm"); Index: duhamel/level.hh --- duhamel/level.hh (revision 3923) +++ duhamel/level.hh (working copy) @@ -73,7 +73,7 @@ bool level_(const Image<I>& input, const mln_value(I)& val, const Neighborhood<N>& nbh, Image<O>& output, unsigned& nlabels) { - typedef impl::level_t<I,N,O> F; + typedef impl::data_t<I,N,O> F; F f(exact(input), val, exact(nbh), exact(output)); canvas::labeling<F> run(f); nlabels = f.nlabels; @@ -86,7 +86,7 @@ bool level_(const Fast_Image<I>& input, const mln_value(I)& val, const Neighborhood<N>& nbh, Fast_Image<O>& output, unsigned& nlabels) { - typedef impl::level_t<I,N,O> F; + typedef impl::data_t<I,N,O> F; F f(exact(input), val, exact(nbh), exact(output)); canvas::labeling_fast<F> run(f); nlabels = f.nlabels; @@ -104,7 +104,7 @@ Image<O>& output, unsigned& nlabels) { mln_precondition(exact(output).domain() == exact(input).domain()); - return impl::level_(exact(input), val, nbh, output, nlabels); + return impl::data_(exact(input), val, nbh, output, nlabels); } # endif // ! MLN_INCLUDE_ONLY Index: duhamel/main.cc --- duhamel/main.cc (revision 3923) +++ duhamel/main.cc (working copy) @@ -3,7 +3,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/io/pbm/load.hh> #include <mln/io/pgm/save.hh> #include <mln/io/pgm/save.hh> Index: duhamel/paste.hh --- duhamel/paste.hh (revision 3923) +++ duhamel/paste.hh (working copy) @@ -9,7 +9,7 @@ namespace mln { - namespace level + namespace data { template <typename I> Index: duhamel/labeling_level_fast.cc --- duhamel/labeling_level_fast.cc (revision 3923) +++ duhamel/labeling_level_fast.cc (working copy) @@ -56,7 +56,7 @@ unsigned n; image2d_b<value::int_u8> out(i1.domain(), border); - labeling::level_fast(i1, 2, c4(), out, n); + labeling::value_fast(i1, 2, c4(), out, n); std::cout << "n = " << n << std::endl; debug::println(out); Index: duhamel/canvas_labeling.hh --- duhamel/canvas_labeling.hh (revision 3923) +++ duhamel/canvas_labeling.hh (working copy) @@ -35,7 +35,7 @@ */ # include <mln/data/fill.hh> -# include <mln/level/sort_points.hh> +# include <mln/data/sort_points.hh> # include <mln/convert/to_window.hh> Index: duhamel/level_cpy_from_mln.hh --- duhamel/level_cpy_from_mln.hh (revision 3923) +++ duhamel/level_cpy_from_mln.hh (working copy) @@ -99,7 +99,7 @@ bool level_(const Image<I>& input, const mln_value(I)& val, const Neighborhood<N>& nbh, Image<O>& output, unsigned& nlabels) { - typedef impl::level_t<I,N,O> F; + typedef impl::data_t<I,N,O> F; F f(exact(input), val, exact(nbh), exact(output)); canvas::labeling<F> run(f); nlabels = f.nlabels; @@ -114,7 +114,7 @@ bool level_(const Fast_Image<I>& input, const mln_value(I)& val, const Neighborhood<N>& nbh, Image<O>& output, unsigned& nlabels) { - typedef impl::level_t<I,N,O> F; + typedef impl::data_t<I,N,O> F; F f(exact(input), val, exact(nbh), exact(output)); canvas::labeling_fast<F> run(f); nlabels = f.nlabels; @@ -134,7 +134,7 @@ Image<O>& output, unsigned& nlabels) { mln_precondition(exact(output).domain() == exact(input).domain()); - return impl::level_(exact(input), val, nbh, output, nlabels); + return impl::data_(exact(input), val, nbh, output, nlabels); } # endif // ! MLN_INCLUDE_ONLY Index: duhamel/mem.hh --- duhamel/mem.hh (revision 3923) +++ duhamel/mem.hh (working copy) @@ -18,7 +18,7 @@ namespace mln { - namespace level + namespace data { template <typename I> Index: duhamel/fill.hh --- duhamel/fill.hh (revision 3923) +++ duhamel/fill.hh (working copy) @@ -23,7 +23,7 @@ namespace mln { - namespace level + namespace data { template <typename I> Index: duhamel/abr_to_image.cc --- duhamel/abr_to_image.cc (revision 3923) +++ duhamel/abr_to_image.cc (working copy) @@ -37,7 +37,7 @@ #include <mln/core/image/image2d.hh> #include <mln/core/set_p.hh> #include <mln/value/int_u8.hh> -#include <mln/level/stretch.hh> +#include <mln/data/stretch.hh> #include <mln/io/pgm/save.hh> #include <vector> @@ -135,7 +135,7 @@ image2d<int_u8> out(output.domain()); - level::stretch (output, out); + data::stretch (output, out); io::pgm::save(out, "out.pgm"); Index: duhamel/labeling_cpy_from_mln.hh --- duhamel/labeling_cpy_from_mln.hh (revision 3923) +++ duhamel/labeling_cpy_from_mln.hh (working copy) @@ -35,7 +35,7 @@ */ # include <mln/data/fill.hh> -# include <mln/level/sort_points.hh> +# include <mln/data/sort_points.hh> # include <mln/convert/to_window.hh> Index: duhamel/labeling.hh --- duhamel/labeling.hh (revision 3923) +++ duhamel/labeling.hh (working copy) @@ -9,7 +9,7 @@ # include <mln/data/fill.hh> # include "fill.hh" -# include <mln/level/sort_points.hh> +# include <mln/data/sort_points.hh> namespace mln Index: levillain/morpho/shortest_path_watershed.hh --- levillain/morpho/shortest_path_watershed.hh (revision 3923) +++ levillain/morpho/shortest_path_watershed.hh (working copy) @@ -44,7 +44,7 @@ # include <queue> # include <mln/data/fill.hh> -# include <mln/level/extrema_components.hh> +# include <mln/data/extrema_components.hh> # include <mln/morpho/lower_completion.hh> # include <mln/trait/value_.hh> @@ -101,7 +101,7 @@ // Initialize output with the minima components. typename ch_value_type<I, DestValue>::ret output = - level::minima_components<DestValue>(input); + data::minima_components<DestValue>(input); // Distance. typedef ntg_cumul_type(DestValue) cumul_type; Index: fred/old/accuprops.cc --- fred/old/accuprops.cc (revision 3923) +++ fred/old/accuprops.cc (working copy) @@ -25,7 +25,7 @@ # define mln_trait_accu_has_stop(A) typename mln::trait::accu_< A >::has_stop /// Shortcut to the accumulator property about behavior when pixel is given as take() value -/// Used for instance in mln::canvas::morpho::leveling +/// Used for instance in mln::canvas::morpho::dataing # define mln_trait_accu_when_pix(A) typename mln::trait::accu_< A >::when_pix namespace mln { @@ -151,7 +151,7 @@ const Image<I>& input, Accumulator<A>& acc) { - impl::generic::leveling(input, acc); + impl::generic::dataing(input, acc); } template <typename I, typename A> @@ -161,7 +161,7 @@ const Image<I>& input, Accumulator<A>& acc) { - impl::leveling_fastest(input, acc); + impl::dataing_fastest(input, acc); } template <typename I, typename A> @@ -177,7 +177,7 @@ mlc_equal(mln_trait_accu_when_pix(A), trait::accu::when_pix::use_v)::value }; - internal::leveling_dispatch(metal::bool_<test>(), + internal::dataing_dispatch(metal::bool_<test>(), input, acc); } @@ -190,7 +190,7 @@ leveling(const Image<I>& input, Accumulator< A< util::pix<I> > >& acc) { - internal::leveling_dispatch(input, acc); + internal::dataing_dispatch(input, acc); } } // end of namespace mln::canvas::morpho @@ -308,7 +308,7 @@ acc.init(); chrono.start(); for (int i = 0; i < 50; i++) - mln::canvas::morpho::leveling(ima, acc); + mln::canvas::morpho::dataing(ima, acc); elapsed = chrono.stop(); std::cout << "(auto) " << elapsed << "s : " << acc.to_result() << std::endl; @@ -316,7 +316,7 @@ acc.init(); chrono.start(); for (int i = 0; i < 50; i++) - mln::canvas::morpho::impl::generic::leveling(ima, acc); + mln::canvas::morpho::impl::generic::dataing(ima, acc); elapsed = chrono.stop(); std::cout << "(generic) " << elapsed << "s : " << acc.to_result() << std::endl; @@ -324,7 +324,7 @@ acc.init(); chrono.start(); for (int i = 0; i < 50; i++) - mln::canvas::morpho::impl::leveling_fastest(ima, acc); + mln::canvas::morpho::impl::dataing_fastest(ima, acc); elapsed = chrono.stop(); std::cout << "(fast) " << elapsed << "s : " << acc.to_result() << std::endl; Index: fred/old/leveling.cc --- fred/old/leveling.cc (revision 3923) +++ fred/old/leveling.cc (working copy) @@ -26,20 +26,20 @@ I out; chrono.start(); - out = mln::canvas::morpho::leveling_filter(lena, c4(), c, lambda, true); + out = mln::canvas::morpho::dataing_filter(lena, c4(), c, lambda, true); elapsed = chrono.stop(); std::cout << "(auto) " << elapsed << "s" << std::endl; mln::io::pgm::save(out, "auto.pgm"); chrono.start(); - out = mln::canvas::morpho::internal::leveling_filter_dispatch(mln::metal::true_(), lena, c4(), c, lambda, true); + out = mln::canvas::morpho::internal::dataing_filter_dispatch(mln::metal::true_(), lena, c4(), c, lambda, true); elapsed = chrono.stop(); std::cout << "(fast) " << elapsed << "s" << std::endl; mln::io::pgm::save(out, "fast.pgm"); chrono.start(); - out = mln::canvas::morpho::internal::leveling_filter_dispatch(mln::metal::false_(), lena, c4(), c, lambda, true); + out = mln::canvas::morpho::internal::dataing_filter_dispatch(mln::metal::false_(), lena, c4(), c, lambda, true); elapsed = chrono.stop(); std::cout << "(slow) " << elapsed << "s" << std::endl; Index: fred/old/algebraic.cc --- fred/old/algebraic.cc (revision 3923) +++ fred/old/algebraic.cc (working copy) @@ -41,8 +41,8 @@ # include <mln/convert/to_upper_window.hh> # include <mln/extension/adjust_fill.hh> -# include <mln/level/sort_psites.hh> -# include <mln/level/sort_offsets.hh> +# include <mln/data/sort_psites.hh> +# include <mln/data/sort_offsets.hh> # include <mln/core/alias/neighb2d.hh> # include "../edwin/accu_trait.hh" @@ -304,8 +304,8 @@ { p_array < mln_psite(I) > s = increasing ? - level::sort_psites_increasing(input) : - level::sort_psites_decreasing(input); + data::sort_psites_increasing(input) : + data::sort_psites_decreasing(input); return impl::generic::algebraic(input, nbh, s, a, lambda); } @@ -317,8 +317,8 @@ { util::array<unsigned> s = increasing ? - level::sort_offsets_increasing(input) : - level::sort_offsets_decreasing(input); + data::sort_offsets_increasing(input) : + data::sort_offsets_decreasing(input); return impl::algebraic_fastest(input, nbh, s, a, lambda); } Index: fred/old/accuprops2.cc --- fred/old/accuprops2.cc (revision 3923) +++ fred/old/accuprops2.cc (working copy) @@ -25,7 +25,7 @@ # define mln_trait_accu_has_stop(A) typename mln::trait::accu_< A >::has_stop /// Shortcut to the accumulator property about behavior when pixel is given as take() value -/// Used for instance in mln::canvas::morpho::leveling +/// Used for instance in mln::canvas::morpho::dataing # define mln_trait_accu_when_pix(A) typename mln::trait::accu_< A >::when_pix namespace mln { @@ -151,7 +151,7 @@ const Image<I>& input, Accumulator<A>& acc) { - impl::generic::leveling(input, acc); + impl::generic::dataing(input, acc); } template <typename I, typename A> @@ -161,7 +161,7 @@ const Image<I>& input, Accumulator<A>& acc) { - impl::leveling_fastest(input, acc); + impl::dataing_fastest(input, acc); } template <typename I, typename A> @@ -177,7 +177,7 @@ mlc_equal(mln_trait_accu_when_pix(A), trait::accu::when_pix::use_v)::value }; - internal::leveling_dispatch(metal::bool_<test>(), + internal::dataing_dispatch(metal::bool_<test>(), input, acc); } @@ -190,7 +190,7 @@ leveling(const Image<I>& input, Accumulator< A< util::pix<I> > >& acc) { - internal::leveling_dispatch(input, acc); + internal::dataing_dispatch(input, acc); } } // end of namespace mln::canvas::morpho @@ -357,7 +357,7 @@ acc.init(); chrono.start(); for (int i = 0; i < 50; i++) - mln::canvas::morpho::leveling(ima, acc); + mln::canvas::morpho::dataing(ima, acc); elapsed = chrono.stop(); std::cout << "(auto) " << elapsed << "s : " << acc.to_result() << std::endl; @@ -365,7 +365,7 @@ acc.init(); chrono.start(); for (int i = 0; i < 50; i++) - mln::canvas::morpho::impl::generic::leveling(ima, acc); + mln::canvas::morpho::impl::generic::dataing(ima, acc); elapsed = chrono.stop(); std::cout << "(generic) " << elapsed << "s : " << acc.to_result() << std::endl; @@ -373,7 +373,7 @@ acc.init(); chrono.start(); for (int i = 0; i < 50; i++) - mln::canvas::morpho::impl::leveling_fastest(ima, acc); + mln::canvas::morpho::impl::dataing_fastest(ima, acc); elapsed = chrono.stop(); std::cout << "(fast) " << elapsed << "s : " << acc.to_result() << std::endl; Index: fred/old/leveling_filter.hh --- fred/old/leveling_filter.hh (revision 3923) +++ fred/old/leveling_filter.hh (working copy) @@ -41,8 +41,8 @@ # include <mln/data/fill.hh> # include <mln/extension/adjust_fill.hh> -# include <mln/level/sort_psites.hh> -# include <mln/level/sort_offsets.hh> +# include <mln/data/sort_psites.hh> +# include <mln/data/sort_offsets.hh> @@ -93,7 +93,7 @@ const Site_Set<S>& s_, const Accumulator<A>& a_, const typename A::result& lambda) { - trace::entering("canvas::morpho::impl::generic::leveling_filter"); + trace::entering("canvas::morpho::impl::generic::dataing_filter"); // FIXME: Test?! const I& input = exact(input_); @@ -185,7 +185,7 @@ output(p) = output(parent(p)); } - trace::exiting("canvas::morpho::impl::generic::leveling_filter"); + trace::exiting("canvas::morpho::impl::generic::dataing_filter"); return output; } @@ -212,7 +212,7 @@ const util::array<unsigned>& s, const Accumulator<A>& a_, const typename A::result& lambda) { - trace::entering("canvas::morpho::impl::leveling_fastest"); + trace::entering("canvas::morpho::impl::dataing_fastest"); // FIXME: Tests? @@ -297,7 +297,7 @@ } } - trace::exiting("canvas::morpho::impl::leveling_fastest"); + trace::exiting("canvas::morpho::impl::dataing_fastest"); return output; } @@ -317,9 +317,9 @@ { p_array < mln_psite(I) > s = increasing ? - level::sort_psites_increasing(input) : - level::sort_psites_decreasing(input); - return impl::generic::leveling_filter(input, nbh, s, a, lambda); + data::sort_psites_increasing(input) : + data::sort_psites_decreasing(input); + return impl::generic::dataing_filter(input, nbh, s, a, lambda); } template <typename I, typename N, typename A> @@ -331,9 +331,9 @@ { util::array<unsigned> s = increasing ? - level::sort_offsets_increasing(input) : - level::sort_offsets_decreasing(input); - return impl::leveling_filter_fastest(input, nbh, s, a, lambda); + data::sort_offsets_increasing(input) : + data::sort_offsets_decreasing(input); + return impl::dataing_filter_fastest(input, nbh, s, a, lambda); } template <typename I, typename N, typename A> @@ -370,7 +370,7 @@ bool increasing) { //FIXME: Do we need to check input validity ? - return internal::leveling_filter_dispatch(input, nbh, a, lambda, increasing); + return internal::dataing_filter_dispatch(input, nbh, a, lambda, increasing); } } // end of namespace mln::canvas::morpho Index: fred/old/accu_trait.hh --- fred/old/accu_trait.hh (revision 3923) +++ fred/old/accu_trait.hh (working copy) @@ -14,7 +14,7 @@ # define mln_trait_accu_has_stop(A) typename mln::trait::accu_< A >::has_stop /// Shortcut to the accumulator property about behavior when pixel is given as take() value -/// Used for instance in mln::canvas::morpho::leveling +/// Used for instance in mln::canvas::morpho::dataing # define mln_trait_accu_when_pix(A) typename mln::trait::accu_< A >::when_pix namespace mln { Index: igr/code/test.cc --- igr/code/test.cc (revision 3923) +++ igr/code/test.cc (working copy) @@ -17,7 +17,7 @@ #include <mln/io/pgm/save.hh> #include <mln/data/paste.hh> -#include <mln/level/apply.hh> +#include <mln/data/apply.hh> #include <mln/fun/v2v/rgb_to_hsi.hh> #include <mln/fun/v2v/abs.hh> Index: icdar/2009/dibco/quasi.cc --- icdar/2009/dibco/quasi.cc (revision 3923) +++ icdar/2009/dibco/quasi.cc (working copy) @@ -20,8 +20,8 @@ #include <mln/labeling/regional_minima.hh> #include <mln/labeling/wrap.hh> -#include <mln/level/transform.hh> -#include <mln/level/convert.hh> +#include <mln/data/transform.hh> +#include <mln/data/convert.hh> #include <mln/math/diff_abs.hh> @@ -54,7 +54,7 @@ mln_precondition(input.is_valid()); typedef mln_psite(I) P; - p_array<P> s = level::sort_psites_increasing(input); + p_array<P> s = data::sort_psites_increasing(input); std::vector<bool> valid; valid.push_back(false); // For valid[0] where 0 is the non-label value. @@ -135,7 +135,7 @@ fun::i2v::array<bool> f_valid; convert::from_to(valid, f_valid); - mln_ch_value(I, bool) out = level::transform(lab, f_valid); + mln_ch_value(I, bool) out = data::transform(lab, f_valid); io::pgm::save(labeling::wrap(value::int_u8(), lab), "tmp_lab.pgm"); Index: icdar/2009/dibco/svg.1.binarization.cc --- icdar/2009/dibco/svg.1.binarization.cc (revision 3923) +++ icdar/2009/dibco/svg.1.binarization.cc (working copy) @@ -361,7 +361,7 @@ fun::i2v::array<int_u8> f_med; convert::from_to(basin_med, f_med); - // io::pgm::save(level::transform(wst, f_med), "basin_med.pgm"); + // io::pgm::save(data::transform(wst, f_med), "basin_med.pgm"); p_vertices<util::graph, fun::i2v::array<point2d> > pv = make::common_pvertices(wst, nbasins, rag_data.first()); @@ -406,7 +406,7 @@ } } - io::pgm::save(level::transform(wst, out.function()), + io::pgm::save(data::transform(wst, out.function()), "temp_out.pgm"); // Enqueuing. @@ -458,7 +458,7 @@ out(p_) = id; // object or background. } - io::pgm::save(level::transform(wst, out.function()), + io::pgm::save(data::transform(wst, out.function()), "temp_out_2.pgm"); } Index: icdar/2009/dibco/svg.2.binarization.cc --- icdar/2009/dibco/svg.2.binarization.cc (revision 3923) +++ icdar/2009/dibco/svg.2.binarization.cc (working copy) @@ -46,8 +46,8 @@ #include <mln/labeling/regional_minima.hh> #include <mln/labeling/wrap.hh> -#include <mln/level/transform.hh> -#include <mln/level/convert.hh> +#include <mln/data/transform.hh> +#include <mln/data/convert.hh> #include <mln/linear/gaussian_1d.hh> @@ -622,9 +622,9 @@ if (echo) { - io::pgm::save(level::transform(w_all, f_med), + io::pgm::save(data::transform(w_all, f_med), "temp_w_all.pgm"); - io::pgm::save(level::transform(ws, f_med), "temp_basin_med.pgm"); + io::pgm::save(data::transform(ws, f_med), "temp_basin_med.pgm"); } p_vertices<util::graph, fun::i2v::array<point2d> > @@ -672,7 +672,7 @@ if (echo) { - io::pgm::save(level::transform(ws, out.function()), + io::pgm::save(data::transform(ws, out.function()), "temp_out.pgm"); } @@ -727,11 +727,11 @@ if (echo) { - io::pgm::save(level::transform(ws, out.function()), + io::pgm::save(data::transform(ws, out.function()), "temp_out_2.pgm"); } - io::pbm::save((pw::value(level::transform(ws, + io::pbm::save((pw::value(data::transform(ws, out.function())) == pw::cst(255)) | input.domain(), argv[4]); Index: icdar/2009/dibco/svg.3.binarization.cc --- icdar/2009/dibco/svg.3.binarization.cc (revision 3923) +++ icdar/2009/dibco/svg.3.binarization.cc (working copy) @@ -48,8 +48,8 @@ #include <mln/labeling/regional_minima.hh> #include <mln/labeling/wrap.hh> -#include <mln/level/transform.hh> -#include <mln/level/convert.hh> +#include <mln/data/transform.hh> +#include <mln/data/convert.hh> #include <mln/linear/gaussian_1d.hh> @@ -725,9 +725,9 @@ if (echo) { - io::pgm::save(level::transform(w_all, f_med), + io::pgm::save(data::transform(w_all, f_med), "temp_w_all.pgm"); - io::pgm::save(level::transform(ws, f_med), "temp_basin_med.pgm"); + io::pgm::save(data::transform(ws, f_med), "temp_basin_med.pgm"); } p_vertices<util::graph, fun::i2v::array<point2d> > @@ -746,7 +746,7 @@ mln_VAR( lab, labeling__quasi_regional_minima(med, nbh, threshold, n_objects) ); - io::pbm::save((pw::value(level::transform(ws, + io::pbm::save((pw::value(data::transform(ws, lab.function())) != pw::cst(0)) | input.domain(), argv[4]); @@ -790,7 +790,7 @@ if (echo) { - io::pgm::save(level::transform(ws, out.function()), + io::pgm::save(data::transform(ws, out.function()), "temp_out.pgm"); } @@ -846,11 +846,11 @@ if (echo) { - io::pgm::save(level::transform(ws, out.function()), + io::pgm::save(data::transform(ws, out.function()), "temp_out_2.pgm"); } - io::pbm::save((pw::value(level::transform(ws, + io::pbm::save((pw::value(data::transform(ws, out.function())) == pw::cst(255)) | input.domain(), argv[4]); Index: icdar/2009/dibco/binarization.cc --- icdar/2009/dibco/binarization.cc (revision 3923) +++ icdar/2009/dibco/binarization.cc (working copy) @@ -48,8 +48,8 @@ #include <mln/labeling/regional_minima.hh> #include <mln/labeling/wrap.hh> -#include <mln/level/transform.hh> -#include <mln/level/convert.hh> +#include <mln/data/transform.hh> +#include <mln/data/convert.hh> #include <mln/linear/gaussian_1d.hh> @@ -509,7 +509,7 @@ mln_precondition(input.is_valid()); typedef mln_psite(I) P; - p_array<P> s = level::sort_psites_increasing(input); + p_array<P> s = data::sort_psites_increasing(input); std::vector<bool> valid; valid.push_back(false); // For valid[0] where 0 is the non-label value. @@ -564,7 +564,7 @@ fun::i2v::array<bool> f_valid; convert::from_to(valid, f_valid); - mln_ch_value(I, bool) out = level::transform(lab, f_valid); + mln_ch_value(I, bool) out = data::transform(lab, f_valid); trace::exiting("labeling__quasi_regional_minima"); return out; @@ -702,9 +702,9 @@ if (echo) { - io::pgm::save(level::transform(w_all, f_med), + io::pgm::save(data::transform(w_all, f_med), "temp_w_all.pgm"); - io::pgm::save(level::transform(ws, f_med), "temp_basin_med.pgm"); + io::pgm::save(data::transform(ws, f_med), "temp_basin_med.pgm"); } p_vertices<util::graph, fun::i2v::array<point2d> > @@ -722,11 +722,11 @@ mln_VAR( lab, labeling__quasi_regional_minima(med, nbh, threshold, n_objects) ); - io::pbm::save(pw::value(level::transform(ws, lab.function())) + io::pbm::save(pw::value(data::transform(ws, lab.function())) | input.domain(), argv[4]); -// io::pbm::save((pw::value(level::transform(ws, +// io::pbm::save((pw::value(data::transform(ws, // lab.function())) != pw::cst(0)) // | input.domain(), // argv[4]); @@ -770,7 +770,7 @@ if (echo) { - io::pgm::save(level::transform(ws, out.function()), + io::pgm::save(data::transform(ws, out.function()), "temp_out.pgm"); } @@ -826,11 +826,11 @@ if (echo) { - io::pgm::save(level::transform(ws, out.function()), + io::pgm::save(data::transform(ws, out.function()), "temp_out_2.pgm"); } - io::pbm::save((pw::value(level::transform(ws, + io::pbm::save((pw::value(data::transform(ws, out.function())) == pw::cst(255)) | input.domain(), argv[4]); Index: icdar/2009/hsc/icdar2ppm.hh --- icdar/2009/hsc/icdar2ppm.hh (revision 3923) +++ icdar/2009/hsc/icdar2ppm.hh (working copy) @@ -4,7 +4,7 @@ # include <mln/core/image/image2d.hh> # include <mln/value/label_8.hh> # include <mln/value/rgb8.hh> -# include <mln/level/compute.hh> +# include <mln/data/compute.hh> # include <mln/accu/count_labels.hh> # include <mln/labeling/colorize.hh> # include <mln/io/ppm/save.hh> @@ -25,7 +25,7 @@ image2d<value::label_8> ima; io::icdar::load(ima, icdarfile, ref.nrows(), ref.ncols()); - value::label_8 nlines = level::compute(accu::meta::count_labels(), ima); + value::label_8 nlines = data::compute(accu::meta::count_labels(), ima); io::ppm::save(labeling::colorize(value::rgb8(), ima, nlines), ppmfile); } Index: icdar/2009/hsc/icdar_io.cc --- icdar/2009/hsc/icdar_io.cc (revision 3923) +++ icdar/2009/hsc/icdar_io.cc (working copy) @@ -3,7 +3,7 @@ #include <mln/make/image2d.hh> #include <mln/debug/println.hh> #include <mln/io/pgm/load.hh> -#include <mln/level/compare.hh> +#include <mln/data/compare.hh> #include "io/icdar/save.hh" #include "io/icdar/load.hh" Index: icdar/2009/hsc/clean_input.hh --- icdar/2009/hsc/clean_input.hh (revision 3923) +++ icdar/2009/hsc/clean_input.hh (working copy) @@ -8,7 +8,7 @@ #include <mln/accu/bbox.hh> #include <mln/fun/i2v/array.hh> -#include <mln/level/transform.hh> +#include <mln/data/transform.hh> namespace mln @@ -39,7 +39,7 @@ center_col <= 3) ok(l) = true; } - return level::transform(lab, ok); + return data::transform(lab, ok); } } // mln Index: icdar/2009/hsc/lines_to_boxes.cc --- icdar/2009/hsc/lines_to_boxes.cc (revision 3923) +++ icdar/2009/hsc/lines_to_boxes.cc (working copy) @@ -4,7 +4,7 @@ #include <mln/io/pgm/load.hh> #include <mln/io/ppm/save.hh> #include <mln/literal/colors.hh> -#include <mln/level/convert.hh> +#include <mln/data/convert.hh> #include <mln/value/label_8.hh> #include <mln/estim/min_max.hh> @@ -48,7 +48,7 @@ input_, n); - image2d<rgb8> out = level::convert(rgb8(), input); + image2d<rgb8> out = data::convert(rgb8(), input); scribo::draw::bounding_boxes(out, boxes, literal::red); io::ppm::save(out, argv[2]); } Index: icdar/2009/hsc/first_attempts/exec/iz_lines.cc --- icdar/2009/hsc/first_attempts/exec/iz_lines.cc (revision 3923) +++ icdar/2009/hsc/first_attempts/exec/iz_lines.cc (working copy) @@ -13,7 +13,7 @@ #include <mln/transform/influence_zone_geodesic.hh> -// #include <mln/level/transform.hh> +// #include <mln/data/transform.hh> // #include <mln/fun/v2v/wrap.hh> Index: icdar/2009/hsc/first_attempts/exec/relabel_lines.cc --- icdar/2009/hsc/first_attempts/exec/relabel_lines.cc (revision 3923) +++ icdar/2009/hsc/first_attempts/exec/relabel_lines.cc (working copy) @@ -16,7 +16,7 @@ #include <mln/labeling/colorize.hh> #include <mln/transform/influence_zone_geodesic.hh> -#include <mln/level/transform.hh> +#include <mln/data/transform.hh> #include <mln/fun/v2v/wrap.hh> @@ -190,7 +190,7 @@ image2d<L2> line_lab = labeling::blobs(lines, c8(), n_lines); { - io::pgm::save(level::transform(line_lab, + io::pgm::save(data::transform(line_lab, fun::v2v::wrap<value::int_u8>()), "tmp_lines.pgm"); } Index: icdar/2009/hsc/first_attempts/boxes.cc --- icdar/2009/hsc/first_attempts/boxes.cc (revision 3923) +++ icdar/2009/hsc/first_attempts/boxes.cc (working copy) @@ -97,7 +97,7 @@ io::dump::save(grouped_text.label_image(), argv[2]); - io::pgm::save(level::transform(grouped_text.label_image(), + io::pgm::save(data::transform(grouped_text.label_image(), fun::v2v::wrap<value::int_u8>()), "tmp.pgm"); Index: icdar/2009/hsc/first_attempts/main.cc --- icdar/2009/hsc/first_attempts/main.cc (revision 3923) +++ icdar/2009/hsc/first_attempts/main.cc (working copy) @@ -7,8 +7,8 @@ #include <mln/pw/all.hh> #include <mln/data/fill.hh> -#include <mln/level/saturate.hh> -#include <mln/level/convert.hh> +#include <mln/data/saturate.hh> +#include <mln/data/convert.hh> #include <mln/arith/revert.hh> #include <mln/value/int_u8.hh> @@ -321,7 +321,7 @@ out = linear::gaussian_directional_2d(temp, 1, h_sigma, 0); out = linear::gaussian_directional_2d(out, 0, v_sigma, 0); - fuzzy = level::saturate(int_u8(), out); + fuzzy = data::saturate(int_u8(), out); # ifdef LOG io::pgm::save(fuzzy, "tmp_fuzzy.pgm"); @@ -350,7 +350,7 @@ io::pgm::save(ws, "tmp_ws.pgm"); - image2d<rgb8> cool = level::convert(rgb8(), small); + image2d<rgb8> cool = data::convert(rgb8(), small); data::fill((cool | (pw::value(ws) == pw::cst(0))).rw(), literal::red); io::ppm::save(cool, "tmp_ws.ppm"); Index: icdar/2009/hsc/input_to_ws.hh --- icdar/2009/hsc/input_to_ws.hh (revision 3923) +++ icdar/2009/hsc/input_to_ws.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/alias/neighb2d.hh> #include <mln/data/fill.hh> -#include <mln/level/saturate.hh> +#include <mln/data/saturate.hh> #include <mln/value/int_u8.hh> @@ -17,7 +17,7 @@ #include <mln/io/ppm/save.hh> #include <mln/literal/colors.hh> #include <mln/labeling/colorize.hh> -#include <mln/level/convert.hh> +#include <mln/data/convert.hh> #include <mln/labeling/wrap.hh> #include <mln/pw/all.hh> #include <mln/core/image/dmorph/image_if.hh> @@ -59,7 +59,7 @@ out = linear::gaussian_directional_2d(temp, 1, h_sigma, 0); out = linear::gaussian_directional_2d(out, 0, v_sigma, 0); - fuzzy = level::saturate(value::int_u8(), out); + fuzzy = data::saturate(value::int_u8(), out); #ifdef LOG io::pgm::save(small, "temp_small.pgm"); @@ -78,14 +78,14 @@ # ifdef LOG { // Watershed line (red) over small image. - image2d<value::rgb8> cool = level::convert(value::rgb8(), small); + image2d<value::rgb8> cool = data::convert(value::rgb8(), small); data::fill((cool | (pw::value(ws) == pw::cst(0))).rw(), literal::red); io::ppm::save(cool, "temp_small_ws.ppm"); } { // Watershed line (red) over fuzzy image. - image2d<value::rgb8> cool = level::convert(value::rgb8(), fuzzy); + image2d<value::rgb8> cool = data::convert(value::rgb8(), fuzzy); data::fill((cool | (pw::value(ws) == pw::cst(0))).rw(), literal::red); io::ppm::save(cool, "temp_fuzzy_ws.ppm"); Index: icdar/2009/hsc/old_input_to_lines.cc --- icdar/2009/hsc/old_input_to_lines.cc (revision 3923) +++ icdar/2009/hsc/old_input_to_lines.cc (working copy) @@ -7,8 +7,8 @@ #include <mln/pw/all.hh> #include <mln/data/fill.hh> -#include <mln/level/saturate.hh> -#include <mln/level/convert.hh> +#include <mln/data/saturate.hh> +#include <mln/data/convert.hh> #include <mln/arith/revert.hh> #include <mln/value/int_u8.hh> @@ -324,7 +324,7 @@ out = linear::gaussian_directional_2d(temp, 1, h_sigma, 0); out = linear::gaussian_directional_2d(out, 0, v_sigma, 0); - fuzzy = level::saturate(int_u8(), out); + fuzzy = data::saturate(int_u8(), out); # ifdef LOG io::pgm::save(fuzzy, "tmp_fuzzy.pgm"); @@ -353,7 +353,7 @@ io::pgm::save(ws, "tmp_ws.pgm"); - image2d<rgb8> cool = level::convert(rgb8(), small); + image2d<rgb8> cool = data::convert(rgb8(), small); data::fill((cool | (pw::value(ws) == pw::cst(0))).rw(), literal::red); io::ppm::save(cool, "tmp_ws.ppm"); Index: icdar/2009/hsc/lines_to_words.cc --- icdar/2009/hsc/lines_to_words.cc (revision 3923) +++ icdar/2009/hsc/lines_to_words.cc (working copy) @@ -7,7 +7,7 @@ #include <mln/io/pbm/all.hh> #include <mln/io/ppm/all.hh> -#include <mln/level/convert.hh> +#include <mln/data/convert.hh> #include <mln/labeling/relabel.hh> #include "get_line_images.hh" @@ -39,7 +39,7 @@ image2d<int_u8> lines_; io::pgm::load(lines_, argv[2]); - image2d<label_16> lines = level::convert(label_16(), lines_); + image2d<label_16> lines = data::convert(label_16(), lines_); label_16 nlines; labeling::relabel_inplace(lines, nlines); Index: icdar/2009/hsc/ws_to_wsl.hh --- icdar/2009/hsc/ws_to_wsl.hh (revision 3923) +++ icdar/2009/hsc/ws_to_wsl.hh (working copy) @@ -10,7 +10,7 @@ #include <mln/value/int_u8.hh> #include <mln/util/array.hh> -#include <mln/level/transform.hh> +#include <mln/data/transform.hh> #include <mln/accu/internal/base.hh> @@ -31,12 +31,12 @@ #include <mln/io/ppm/save.hh> #include <mln/literal/colors.hh> -#include <mln/level/convert.hh> +#include <mln/data/convert.hh> #include <mln/pw/all.hh> #include <mln/core/image/dmorph/image_if.hh> #include <mln/fun/i2v/array.hh> -#include <mln/level/transform.hh> +#include <mln/data/transform.hh> #include <mln/labeling/colorize.hh> @@ -406,7 +406,7 @@ for (L l = 1; l <= n_basins; ++l) f_relab(l) = parent[l]; - image2d<L> ws_ = level::transform(ws, f_relab); + image2d<L> ws_ = data::transform(ws, f_relab); image2d<rgb8> cool = labeling::colorize(rgb8(), ws_, n_basins); data::fill((cool | (pw::value(ws) == pw::cst(0))).rw(), literal::white); Index: nivault/plugin-gimp/src/build-image.hh --- nivault/plugin-gimp/src/build-image.hh (revision 3923) +++ nivault/plugin-gimp/src/build-image.hh (working copy) @@ -38,7 +38,7 @@ # include <mln/value/rgb8.hh> # include <mln/literal/all.hh> # include <mln/core/concept/function.hh> -# include <mln/level/transform.hh> +# include <mln/data/transform.hh> # include <mln/border/resize.hh> # include <mln/io/ppm/save.hh> Index: nivault/extract_score.cc --- nivault/extract_score.cc (revision 3923) +++ nivault/extract_score.cc (working copy) @@ -63,8 +63,8 @@ # include <mln/core/mesh_p.hh> # include <mln/draw/mesh.hh> -# include <mln/level/stretch.hh> -# include <mln/level/threshold.hh> +# include <mln/data/stretch.hh> +# include <mln/data/threshold.hh> # include <mln/linear/gaussian.hh> # include <mln/core/image_if_value.hh> @@ -160,7 +160,7 @@ pt2[coord] = 0; projected(pt2) += ima(p); } - level::stretch(projected, projected_stretched); + data::stretch(projected, projected_stretched); return projected_stretched; } @@ -190,10 +190,10 @@ // linear::gaussian(histo_col, 5, histo_col_blur); // io::pgm::save(histo_col_blur, "histo_col_blur.pgm"); -// level::stretch(histo_col, histo_col); +// data::stretch(histo_col, histo_col); // io::pgm::save(histo_col, "histo_col.pgm"); // IB histo_col_b(histo_col.domain()); -// histo_col_b = level::threshold(histo_col, mln_value_(IU8)(175)); +// histo_col_b = data::threshold(histo_col, mln_value_(IU8)(175)); // io::pbm::save(histo_col_b, "histo_col_b.pbm"); // } @@ -205,7 +205,7 @@ // unsigned nlabels; // IU inter_labeled = labeling::blobs(only_big, c4(), nlabels); // labelling blobs don't use algo(input, output) formalism // IU8 labeled(inter_labeled.domain()); // and it should return int_u8 ? -// level::stretch(inter_labeled, labeled); +// data::stretch(inter_labeled, labeled); // io::pgm::save(labeled, "labeled.pgm"); // } Index: nivault/extract_character.cc --- nivault/extract_character.cc (revision 3923) +++ nivault/extract_character.cc (working copy) @@ -61,7 +61,7 @@ # include <mln/core/mesh_p.hh> # include <mln/draw/mesh.hh> -# include <mln/level/stretch.hh> +# include <mln/data/stretch.hh> # include <mln/core/image_if_value.hh> # include <mln/core/image/dmorph/sub_image.hh> @@ -335,17 +335,17 @@ image2d<int_u8> out (label_image.domain ()); // // Save the influence area of the node of the graphe (seed2tiling result). -// level::stretch (zi_image, out); +// data::stretch (zi_image, out); // io::pgm::save(out, path_output + ".text_area.approx.pgm"); // std::cout << path_output + ".text_area.approx.pgm" << " generated" << std::endl; // // Save the graph of the text. -// level::stretch (gr_image, out); +// data::stretch (gr_image, out); // io::pgm::save(out, path_output + ".text_graph.pgm"); // std::cout << path_output + ".text_graph.pgm" << " generated" << std::endl; // Save the the text image. - level::stretch (text_image, out); + data::stretch (text_image, out); io::pgm::save(out, path_output + ".text.pgm"); std::cout << path_output + ".text.pgm" << " generated" << std::endl; @@ -354,7 +354,7 @@ std::cout << path_output + ".ppm" << " generated" << std::endl; // image2d<int_u8> process (input.domain ()); -// level::stretch (output_2, process); +// data::stretch (output_2, process); // io::pgm::save(process, "process.pgm"); } Index: nivault/median.hh --- nivault/median.hh (revision 3923) +++ nivault/median.hh (working copy) @@ -28,7 +28,7 @@ #ifndef MLN_LEVEL_MEDIAN_HH # define MLN_LEVEL_MEDIAN_HH -/*! \file mln/level/median.hh +/*! \file mln/data/median.hh * * \brief Median filtering of an image. */ @@ -56,7 +56,7 @@ namespace mln { - namespace level + namespace data { /*! Compute in \p output the median filter of image \p input by @@ -223,7 +223,7 @@ # endif - } // end of namespace mln::level::impl + } // end of namespace mln::data::impl // Facades. @@ -249,7 +249,7 @@ # endif // ! MLN_INCLUDE_ONLY - } // end of namespace mln::level + } // end of namespace mln::data } // end of namespace mln Index: exec/bw_negate_in_color.cc --- exec/bw_negate_in_color.cc (revision 3923) +++ exec/bw_negate_in_color.cc (working copy) @@ -42,5 +42,5 @@ io::ppm::load(input, argv[1]); bw_negate_in_color f; - io::ppm::save(level::transform(input, f), argv[2]); + io::ppm::save(data::transform(input, f), argv[2]); } Index: fabien/igr/time_max_norm.cc --- fabien/igr/time_max_norm.cc (revision 3923) +++ fabien/igr/time_max_norm.cc (working copy) @@ -24,8 +24,8 @@ #include <mln/data/fill.hh> #include <mln/data/paste.hh> -#include <mln/level/compute.hh> -#include <mln/level/stretch.hh> +#include <mln/data/compute.hh> +#include <mln/data/stretch.hh> #include <mln/math/abs.hh> #include <mln/pw/all.hh> @@ -66,8 +66,8 @@ std::ostringstream stime; stime << desc << "_time.pgm"; - image2d<int_u8> result_c = level::stretch(int_u8(), ima_c); - image2d<int_u8> result_t = level::stretch(int_u8(), ima_t); + image2d<int_u8> result_c = data::stretch(int_u8(), ima_c); + image2d<int_u8> result_t = data::stretch(int_u8(), ima_t); io::pgm::save(result_c, smax.str()); io::pgm::save(result_t, stime.str()); } Index: fabien/igr/smooth_fixed_seg/main.cc --- fabien/igr/smooth_fixed_seg/main.cc (revision 3923) +++ fabien/igr/smooth_fixed_seg/main.cc (working copy) @@ -28,9 +28,9 @@ #include <mln/fun/v2v/fit.hh> #include <mln/labeling/compute.hh> #include <mln/labeling/wrap.hh> -#include <mln/level/compute.hh> -#include <mln/level/convert.hh> -#include <mln/level/stretch.hh> +#include <mln/data/compute.hh> +#include <mln/data/convert.hh> +#include <mln/data/stretch.hh> #include <mln/linear/convolve.hh> #include <mln/make/image2d.hh> #include <mln/make/w_window1d.hh> @@ -111,12 +111,12 @@ image1d<V> tmp_ima; convert::from_to(v1, tmp_ima); image1d<float> morpho_ima = mean_image(tmp_ima); - float sum_v1 = level::compute(accu_sum, morpho_ima); + float sum_v1 = data::compute(accu_sum, morpho_ima); image1d<V> tmp_ima2; convert::from_to(v2, tmp_ima2); image1d<float> morpho_ima2 = mean_image(tmp_ima2); - float sum_v2 = level::compute(accu_sum, morpho_ima2); + float sum_v2 = data::compute(accu_sum, morpho_ima2); mln_piter(image1d<float>) p(morpho_ima.domain()); for_all(p) @@ -168,14 +168,14 @@ // Edges distance computation. mln_VAR(edges, world::inter_pixel::compute(imax, dist)); - mln_VAR(e, level::transform(edges, fun::v2v::fit<float>(SATURATION))); + mln_VAR(e, data::transform(edges, fun::v2v::fit<float>(SATURATION))); io::dump::save(e.unmorph_(), "edges_int_u12.dump"); typedef int_u12 E_TYPE; { // Display. mln_VAR(display_ima, world::inter_pixel::display_edge(e.unmorph_(), 0.0, 3)); - io::pgm::save(level::stretch(int_u8(), display_ima), "01_edges.pgm"); + io::pgm::save(data::stretch(int_u8(), display_ima), "01_edges.pgm"); } @@ -186,7 +186,7 @@ { // Display. mln_VAR(display_clo, world::inter_pixel::display_edge(clo.unmorph_(), 0.0, 3)); - io::pgm::save(level::stretch(int_u8(), display_clo), "03_closing.pgm"); + io::pgm::save(data::stretch(int_u8(), display_clo), "03_closing.pgm"); } @@ -233,7 +233,7 @@ for (unsigned i = 1; i < means.nelements(); ++i) data::fill((ima_means | pw::value(ima_means) == pw::cst(i)).rw(), means[i]); mln_VAR(display_means, world::inter_pixel::display_edge(ima_means.unmorph_(), 0.0, 3)); - io::pgm::save(level::stretch(int_u8(), display_means), "04_means.pgm"); + io::pgm::save(data::stretch(int_u8(), display_means), "04_means.pgm"); } Index: fabien/igr/time_max.cc --- fabien/igr/time_max.cc (revision 3923) +++ fabien/igr/time_max.cc (working copy) @@ -22,8 +22,8 @@ #include <mln/data/fill.hh> #include <mln/data/paste.hh> -#include <mln/level/compute.hh> -#include <mln/level/stretch.hh> +#include <mln/data/compute.hh> +#include <mln/data/stretch.hh> #include <mln/math/abs.hh> #include <mln/pw/all.hh> @@ -108,8 +108,8 @@ ima_t(p) = k; } - image2d<int_u8> result_c = level::stretch(int_u8(), ima_c); - image2d<int_u8> result_t = level::stretch(int_u8(), ima_t); + image2d<int_u8> result_c = data::stretch(int_u8(), ima_c); + image2d<int_u8> result_t = data::stretch(int_u8(), ima_t); io::magick::save(result_c, "result_max.png"); io::magick::save(result_t, "result_time.png"); Index: fabien/igr/fun_labels.cc --- fabien/igr/fun_labels.cc (revision 3923) +++ fabien/igr/fun_labels.cc (working copy) @@ -28,8 +28,8 @@ #include <mln/accu/mean.hh> #include <mln/accu/median_h.hh> #include <mln/data/fill.hh> -#include <mln/level/compute.hh> -#include <mln/level/stretch.hh> +#include <mln/data/compute.hh> +#include <mln/data/stretch.hh> #include <mln/make/box3d.hh> #include <mln/morpho/elementary/dilation.hh> #include <mln/pw/all.hh> @@ -72,7 +72,7 @@ sli, max_row, max_col); mln_VAR(slice_label, vol_label | slice); accu::mean<mln_value(I)> accu_mean; - float mean = level::compute(accu_mean, slice_label); + float mean = data::compute(accu_mean, slice_label); arr.append(mean); } @@ -105,7 +105,7 @@ { image2d<int_u12> ima_slice = duplicate(slice(ima, sli)); image2d<label_16> lbl_slice = duplicate(slice(ima_labels, sli)); - float mean = level::compute(accu_mean, ima_slice | pw::value(lbl_slice) == pw::cst(l)); + float mean = data::compute(accu_mean, ima_slice | pw::value(lbl_slice) == pw::cst(l)); arrays[l].append(mean); } } @@ -168,7 +168,7 @@ } // Taking the median value of the region. accu::mean<mln_value(I)> accu_mean; - mln_value(I) mean = level::compute(accu_mean, ima_slice | pw::value(lbl_slice) == pw::cst(lbl_slice(point))); + mln_value(I) mean = data::compute(accu_mean, ima_slice | pw::value(lbl_slice) == pw::cst(lbl_slice(point))); arr.append(mean); prev_lbl = lbl_slice(point); @@ -181,7 +181,7 @@ if (sli < 10) str_ima << "0"; str_ima << sli << ".pgm"; - io::pgm::save(level::stretch(int_u8(), ima_slice), str_ima.str());*/ + io::pgm::save(data::stretch(int_u8(), ima_slice), str_ima.str());*/ } if (!arr.is_empty()) Index: fabien/igr/norm.cc --- fabien/igr/norm.cc (revision 3923) +++ fabien/igr/norm.cc (working copy) @@ -21,11 +21,11 @@ #include <mln/core/var.hh> #include <mln/estim/min_max.hh> #include <mln/io/pgm/save.hh> -#include <mln/level/stretch.hh> +#include <mln/data/stretch.hh> #include <mln/value/int_u8.hh> /*#include <mln/accu/min.hh> #include <mln/accu/max.hh> -#include <mln/level/compute.hh>*/ +#include <mln/data/compute.hh>*/ using namespace mln; using value::int_u12; @@ -65,7 +65,7 @@ image2d<float> ima_ini = mean_slices(ima_f, first, last); // Debug. - //io::pgm::save(level::stretch(value::int_u8(), ima_ini), "mean_slices.pgm"); + //io::pgm::save(data::stretch(value::int_u8(), ima_ini), "mean_slices.pgm"); image3d<float> ima_result; initialize(ima_result, ima); Index: fabien/igr/watershed2d.cc --- fabien/igr/watershed2d.cc (revision 3923) +++ fabien/igr/watershed2d.cc (working copy) @@ -17,8 +17,8 @@ #include <mln/value/int_u12.hh> #include <mln/value/label_16.hh> -#include <mln/level/transform.hh> -#include <mln/level/stretch.hh> +#include <mln/data/transform.hh> +#include <mln/data/stretch.hh> #include <mln/labeling/mean_values.hh> @@ -50,7 +50,7 @@ #include <mln/accu/compute.hh> #include <mln/core/alias/dpoint2d.hh> #include <mln/draw/box.hh> -#include <mln/level/stretch.hh> +#include <mln/data/stretch.hh> #include <mln/fun/v2v/id.hh> #include <mln/fun/l2l/wrap.hh> #include <mln/core/image/line_graph_elt_neighborhood.hh> @@ -132,7 +132,7 @@ convert::from_to(m_3f, m); m[0] = 150u; - /*io::ppm::save(level::transform(w, + /*io::ppm::save(data::transform(w, convert::to< fun::i2v::array<mln_value(I)> >(m)), "wst_rag_wshd_color.ppm");*/ @@ -259,7 +259,7 @@ image2d<int_u12> dcm; io::dicom::load(dcm, argv[1]); - io::pgm::save(level::stretch(int_u8(), dcm), "wsd_01_src.pgm"); + io::pgm::save(data::stretch(int_u8(), dcm), "wsd_01_src.pgm"); image2d<int_u12> grad = morpho::gradient(dcm, win_c4p()); image2d<int_u12> clo = morpho::closing::area(grad, c4(), closure_lambda); @@ -267,14 +267,14 @@ label_16 nbasins; image2d<label_16> wshed = morpho::meyer_wst(clo, c4(), nbasins); - io::pgm::save(level::stretch(int_u8(), clo), "wsd_02.pgm"); - io::pgm::save(level::transform(wshed, fun::l2l::wrap<int_u8>()), "wsd_03.pgm"); + io::pgm::save(data::stretch(int_u8(), clo), "wsd_02.pgm"); + io::pgm::save(data::transform(wshed, fun::l2l::wrap<int_u8>()), "wsd_03.pgm"); mln_VAR(vol2_, morpho::elementary::dilation(extend(wshed | (pw::value(wshed) == 0u), wshed), c8())); data::fill((wshed | (pw::value(wshed) == 0u)).rw(), vol2_); - io::pgm::save(level::transform(wshed, fun::l2l::wrap<int_u8>()), "wsd_04.pgm"); + io::pgm::save(data::transform(wshed, fun::l2l::wrap<int_u8>()), "wsd_04.pgm"); /// Build graph util::graph g = make::graph(wshed, c4(), nbasins); @@ -309,9 +309,9 @@ } mln_invariant(f(0) == 0u); --nbasins2; // nbasins2 does not count the basin with label 0. - image2d<label_16> wsd2 = level::transform(wshed, f); + image2d<label_16> wsd2 = data::transform(wshed, f); - io::pgm::save(level::transform(wsd2, fun::l2l::wrap<int_u8>()), "wsd_05.pgm"); + io::pgm::save(data::transform(wsd2, fun::l2l::wrap<int_u8>()), "wsd_05.pgm"); /// Reconstruct a graph from the simplified image. util::graph g2 = make::graph(wsd2, c4(), nbasins2); @@ -324,8 +324,8 @@ data::fill((wsd2 | (pw::value(wsd2) == 0u)).rw(), wsd2_); - io::pgm::save(level::transform(labeling::mean_values(dcm, wsd2, nbasins2), fun::l2l::wrap<int_u8>()), "wsd_06_mean_colors.pgm"); - io::pgm::save(level::stretch(int_u8(), make_debug_graph_image(dcm, ima_v2, ima_e2, box_size, 4095)), "wsd_07_graph_image2_white.pgm"); - io::pgm::save(level::stretch(int_u8(), make_debug_graph_image(dcm, ima_v2, ima_e2, box_size, 0)), "wsd_08_graph_image2_black.pgm"); - io::pgm::save(level::transform(wsd2, fun::l2l::wrap<int_u8>()), "wsd_99_result.pgm"); + io::pgm::save(data::transform(labeling::mean_values(dcm, wsd2, nbasins2), fun::l2l::wrap<int_u8>()), "wsd_06_mean_colors.pgm"); + io::pgm::save(data::stretch(int_u8(), make_debug_graph_image(dcm, ima_v2, ima_e2, box_size, 4095)), "wsd_07_graph_image2_white.pgm"); + io::pgm::save(data::stretch(int_u8(), make_debug_graph_image(dcm, ima_v2, ima_e2, box_size, 0)), "wsd_08_graph_image2_black.pgm"); + io::pgm::save(data::transform(wsd2, fun::l2l::wrap<int_u8>()), "wsd_99_result.pgm"); } Index: fabien/igr/watershed3d.cc --- fabien/igr/watershed3d.cc (revision 3923) +++ fabien/igr/watershed3d.cc (working copy) @@ -21,8 +21,8 @@ #include <mln/value/label_16.hh> #include <mln/value/label_32.hh> -#include <mln/level/transform.hh> -#include <mln/level/stretch.hh> +#include <mln/data/transform.hh> +#include <mln/data/stretch.hh> #include <mln/labeling/mean_values.hh> @@ -54,7 +54,7 @@ #include <mln/accu/compute.hh> #include <mln/core/alias/dpoint2d.hh> #include <mln/draw/box.hh> -#include <mln/level/stretch.hh> +#include <mln/data/stretch.hh> #include <mln/fun/v2v/id.hh> #include <mln/fun/l2l/wrap.hh> #include <mln/core/image/line_graph_elt_neighborhood.hh> @@ -136,7 +136,7 @@ convert::from_to(m_3f, m); m[0] = 150u; - /*io::ppm::save(level::transform(w, + /*io::ppm::save(data::transform(w, convert::to< fun::i2v::array<mln_value(I)> >(m)), "wst_rag_wshd_color.ppm");*/ @@ -266,7 +266,7 @@ // Debug assert(mln_max(label_32) == 4294967295); - io::dump::save(level::stretch(int_u8(), dcm), "wsd_01_src.dump"); + io::dump::save(data::stretch(int_u8(), dcm), "wsd_01_src.dump"); // Gradient image3d<int_u12> grad = morpho::elementary::gradient(dcm, c6()); @@ -280,13 +280,13 @@ std::cout << "nbasins = " << nbasins << std::endl; // Debug - io::dump::save(level::stretch(int_u8(), clo), "wsd_02.dump"); - io::dump::save(level::transform(wshed, fun::l2l::wrap<int_u8>()), "wsd_03.dump"); + io::dump::save(data::stretch(int_u8(), clo), "wsd_02.dump"); + io::dump::save(data::transform(wshed, fun::l2l::wrap<int_u8>()), "wsd_03.dump"); //mln_VAR(vol2_, morpho::elementary::dilation(extend(wshed | (pw::value(wshed) == 0u), wshed), c26())); //data::fill((wshed | (pw::value(wshed) == 0u)).rw(), vol2_); - io::dump::save(level::transform(wshed, fun::l2l::wrap<int_u8>()), "wsd_04.dump"); + io::dump::save(data::transform(wshed, fun::l2l::wrap<int_u8>()), "wsd_04.dump"); /// Graph trace::quiet = false; @@ -322,9 +322,9 @@ } mln_invariant(f(0) == 0u); --nbasins2; // nbasins2 does not count the basin with label 0. - image3d<label_32> wsd2 = level::transform(wshed, f); + image3d<label_32> wsd2 = data::transform(wshed, f); - io::dump::save(level::transform(wsd2, fun::l2l::wrap<int_u8>()), "wsd_05.dump"); + io::dump::save(data::transform(wsd2, fun::l2l::wrap<int_u8>()), "wsd_05.dump"); /// Reconstruct a graph from the simplified image. util::graph g2 = make::graph(wsd2, c6(), nbasins2); @@ -337,8 +337,8 @@ data::fill((wsd2 | (pw::value(wsd2) == 0u)).rw(), wsd2_); - io::dump::save(level::transform(labeling::mean_values(dcm, wsd2, nbasins2), fun::l2l::wrap<int_u8>()), "wsd_06_mean_colors.dump"); - //io::dump::save(level::stretch(int_u8(), make_debug_graph_image(dcm, ima_v2, ima_e2, box_size, 4095)), "wsd_07_graph_image2_white.dump"); - //io::dump::save(level::stretch(int_u8(), make_debug_graph_image(dcm, ima_v2, ima_e2, box_size, 0)), "wsd_08_graph_image2_black.dump"); - io::dump::save(level::transform(wsd2, fun::l2l::wrap<int_u8>()), "wsd_99_result.dump");*/ + io::dump::save(data::transform(labeling::mean_values(dcm, wsd2, nbasins2), fun::l2l::wrap<int_u8>()), "wsd_06_mean_colors.dump"); + //io::dump::save(data::stretch(int_u8(), make_debug_graph_image(dcm, ima_v2, ima_e2, box_size, 4095)), "wsd_07_graph_image2_white.dump"); + //io::dump::save(data::stretch(int_u8(), make_debug_graph_image(dcm, ima_v2, ima_e2, box_size, 0)), "wsd_08_graph_image2_black.dump"); + io::dump::save(data::transform(wsd2, fun::l2l::wrap<int_u8>()), "wsd_99_result.dump");*/ } Index: fabien/igr/min_max_float.cc --- fabien/igr/min_max_float.cc (revision 3923) +++ fabien/igr/min_max_float.cc (working copy) @@ -10,7 +10,7 @@ #include <mln/histo/array.hh> #include <mln/histo/compute.hh> -#include <mln/level/transform.hh> +#include <mln/data/transform.hh> namespace mln @@ -78,7 +78,7 @@ 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)); + /*image3d<value::int_u12> quantified = data::transform(input, int_u12_from_float(min, max)); histo::array<value::int_u12> histogram = histo::compute(quantified); image1d<value::int_u12> hist_ima; Index: fabien/igr/seg_vol_irm.hh --- fabien/igr/seg_vol_irm.hh (revision 3923) +++ fabien/igr/seg_vol_irm.hh (working copy) @@ -61,16 +61,16 @@ #include <mln/labeling/fill_holes.hh> #include <mln/labeling/n_max.hh> -#include <mln/level/compare.hh> -#include <mln/level/compute.hh> -#include <mln/level/convert.hh> -#include <mln/level/stretch.hh> -#include <mln/level/transform.hh> +#include <mln/data/compare.hh> +#include <mln/data/compute.hh> +#include <mln/data/convert.hh> +#include <mln/data/stretch.hh> +#include <mln/data/transform.hh> #include <mln/fun/internal/selector.hh> #include <mln/fun/v2b/threshold.hh> -#include <mln/level/transform.hh> +#include <mln/data/transform.hh> #include <mln/accu/count.hh> #include <mln/accu/center.hh> @@ -198,7 +198,7 @@ ima_histo(point1d(i)) += ima_histo(point1d(i - 1)); } accu::max<unsigned> max_accu; - unsigned max = level::compute(max_accu, ima_histo); + unsigned max = data::compute(max_accu, ima_histo); bool low_done = false; bool high_done = false; for (unsigned int i = 0; i < ima_histo.nelements(); ++i) @@ -246,7 +246,7 @@ data::fill((ima_obj | (pw::value(obj_labels) != pw::cst(arr_o_big[1]))).rw(), false);*/ // Debug output images - mln_ch_value(I, rgb8) out = level::convert(rgb8(), level::stretch(int_u8(), input)); + mln_ch_value(I, rgb8) out = data::convert(rgb8(), level::stretch(int_u8(), input)); data::fill((out | pw::value(morpho::elementary::gradient_internal(ima_bg, nbh)) == true).rw(), literal::red); data::fill((out | pw::value(morpho::elementary::gradient_internal(ima_obj, nbh)) == true).rw(), literal::green); save_regions_color(out, metal::int_<I::site::dim>()); @@ -269,7 +269,7 @@ image1d<unsigned> ima_bg_histo; convert::from_to(bg_histo, ima_bg_histo); ima_bg_histo(point1d(0)) = 0; - unsigned bg_sum = level::compute(sum_accu, ima_bg_histo); + unsigned bg_sum = data::compute(sum_accu, ima_bg_histo); std::ofstream fout_bg("bg_histo.plot"); std::ofstream fout_p_bg("bg_histo_norm.plot"); for (unsigned int i = 0; i < ima_bg_histo.nelements(); ++i) @@ -282,7 +282,7 @@ image1d<unsigned> ima_obj_histo; convert::from_to(obj_histo, ima_obj_histo); - unsigned obj_sum = level::compute(sum_accu, ima_obj_histo); + unsigned obj_sum = data::compute(sum_accu, ima_obj_histo); std::ofstream fout_obj("obj_histo.plot"); std::ofstream fout_p_obj("obj_histo_norm.plot"); for (unsigned int i = 0; i < ima_obj_histo.nelements(); ++i) @@ -316,10 +316,10 @@ unsigned coef = 1; accu::mean<unsigned> mean_accu; - unsigned mean = level::compute(mean_accu, (input | (pw::value(input) != 0))); + unsigned mean = data::compute(mean_accu, (input | (pw::value(input) != 0))); accu::stat::deviation<unsigned, unsigned, float> dev_accu(mean); - float deviation = level::compute(dev_accu, (input | pw::value(input) != 0)); + float deviation = data::compute(dev_accu, (input | pw::value(input) != 0)); std::cout << "[mean = " << mean << " | deviation = " << deviation << "]"; return floor(mean + coef * deviation); Index: fabien/igr/wst_edges.cc --- fabien/igr/wst_edges.cc (revision 3923) +++ fabien/igr/wst_edges.cc (working copy) @@ -32,9 +32,9 @@ #include <mln/fun/v2v/fit.hh> #include <mln/labeling/compute.hh> #include <mln/labeling/wrap.hh> -#include <mln/level/compute.hh> -#include <mln/level/convert.hh> -#include <mln/level/stretch.hh> +#include <mln/data/compute.hh> +#include <mln/data/convert.hh> +#include <mln/data/stretch.hh> #include <mln/make/image2d.hh> #include <mln/make/w_window1d.hh> #include <mln/math/diff_abs.hh> Index: fabien/igr/mat2mln/raw2mlndata.cc --- fabien/igr/mat2mln/raw2mlndata.cc (revision 3923) +++ fabien/igr/mat2mln/raw2mlndata.cc (working copy) @@ -6,7 +6,7 @@ #include <mln/io/pgm/save.hh> #include <mln/value/int_u8.hh> -#include <mln/level/stretch.hh> +#include <mln/data/stretch.hh> #include <mln/core/image/dmorph/slice_image.hh> #include <mln/core/routine/duplicate.hh> #include <mln/core/image/image2d.hh> @@ -123,7 +123,7 @@ // Debug. image2d<V> ima_debug; ima_debug = duplicate(slice(ima, 50)); - //io::pgm::save(level::stretch(value::int_u8(), ima_debug), "debug.pgm"); + //io::pgm::save(data::stretch(value::int_u8(), ima_debug), "debug.pgm"); io::pgm::save(ima_debug, "debug.pgm"); return 0; Index: fabien/igr/mat2mln/mat2mln.cc --- fabien/igr/mat2mln/mat2mln.cc (revision 3923) +++ fabien/igr/mat2mln/mat2mln.cc (working copy) @@ -8,7 +8,7 @@ #include <mln/debug/slices_2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/save.hh> -#include <mln/level/stretch.hh> +#include <mln/data/stretch.hh> using namespace mln; using value::int_u8; @@ -53,7 +53,7 @@ io::dump::save(ima, argv[2]); - image2d<int_u8> ima_flat = debug::slices_2d(level::stretch(int_u8(), ima), 1.f, 0); + image2d<int_u8> ima_flat = debug::slices_2d(data::stretch(int_u8(), ima), 1.f, 0); io::pgm::save(ima_flat, "debug.pgm"); return 0; Index: fabien/igr/label2gif.cc --- fabien/igr/label2gif.cc (revision 3923) +++ fabien/igr/label2gif.cc (working copy) @@ -27,8 +27,8 @@ #include <mln/accu/mean.hh> #include <mln/accu/median_h.hh> #include <mln/data/fill.hh> -#include <mln/level/compute.hh> -#include <mln/level/stretch.hh> +#include <mln/data/compute.hh> +#include <mln/data/stretch.hh> #include <mln/make/box3d.hh> #include <mln/morpho/elementary/dilation.hh> #include <mln/pw/all.hh> @@ -64,7 +64,7 @@ str_ima << "0"; str_ima << sli << ".pgm"; - io::pgm::save(level::stretch(int_u8(), ima_slice), str_ima.str()); + io::pgm::save(data::stretch(int_u8(), ima_slice), str_ima.str()); } } Index: fabien/igr/plot_label.hh --- fabien/igr/plot_label.hh (revision 3923) +++ fabien/igr/plot_label.hh (working copy) @@ -15,7 +15,7 @@ #include <mln/accu/mean.hh> #include <mln/accu/median_h.hh> -#include <mln/level/compute.hh> +#include <mln/data/compute.hh> #include <mln/pw/all.hh> #include <mln/util/array.hh> @@ -38,7 +38,7 @@ { image2d<I> slice_ima = duplicate(slice(ima, sli)); accu::mean<I> accu_mean; - float mean = level::compute(accu_mean, slice_ima | ima_label.domain()); + float mean = data::compute(accu_mean, slice_ima | ima_label.domain()); arr.append(mean); } Index: fabien/igr/space_smooth/morpho.cc --- fabien/igr/space_smooth/morpho.cc (revision 3923) +++ fabien/igr/space_smooth/morpho.cc (working copy) @@ -20,8 +20,8 @@ /*#include <mln/draw/line.hh> #include <mln/io/magick/save.hh> -#include <mln/level/convert.hh> -#include <mln/level/stretch.hh> +#include <mln/data/convert.hh> +#include <mln/data/stretch.hh> #include <mln/value/int_u8.hh> #include <mln/value/rgb8.hh> #include <mln/literal/all.hh> @@ -73,7 +73,7 @@ // Outputs // // // ///////////// - /*image2d<rgb8> ima_color = level::convert(rgb8(), level::stretch(int_u8(), slice(input, 0))); + /*image2d<rgb8> ima_color = data::convert(rgb8(), level::stretch(int_u8(), slice(input, 0))); algebra::vec<2, unsigned int> vmin; algebra::vec<2, unsigned int> vmax; vmin[0] = 160; Index: fabien/igr/watershed.hh --- fabien/igr/watershed.hh (revision 3923) +++ fabien/igr/watershed.hh (working copy) @@ -17,8 +17,8 @@ #include <mln/value/int_u12.hh> #include <mln/value/label_16.hh> -#include <mln/level/transform.hh> -#include <mln/level/stretch.hh> +#include <mln/data/transform.hh> +#include <mln/data/stretch.hh> #include <mln/labeling/mean_values.hh> @@ -50,7 +50,7 @@ #include <mln/accu/compute.hh> #include <mln/core/alias/dpoint2d.hh> #include <mln/draw/box.hh> -#include <mln/level/stretch.hh> +#include <mln/data/stretch.hh> #include <mln/fun/v2v/id.hh> #include <mln/fun/l2l/wrap.hh> #include <mln/core/image/line_graph_elt_neighborhood.hh> @@ -132,7 +132,7 @@ convert::from_to(m_3f, m); m[0] = 150u; - /*io::ppm::save(level::transform(w, + /*io::ppm::save(data::transform(w, convert::to< fun::i2v::array<mln_value(I)> >(m)), "wst_rag_wshd_color.ppm");*/ @@ -259,7 +259,7 @@ image2d<int_u12> dcm; io::dicom::load(dcm, argv[1]); - io::pgm::save(level::stretch(int_u8(), dcm), "wsd_01_src.pgm"); + io::pgm::save(data::stretch(int_u8(), dcm), "wsd_01_src.pgm"); image2d<int_u12> grad = morpho::gradient(dcm, win_c4p()); image2d<int_u12> clo = morpho::closing::area(grad, c4(), closure_lambda); @@ -267,14 +267,14 @@ label_16 nbasins; image2d<label_16> wshed = morpho::meyer_wst(clo, c4(), nbasins); - io::pgm::save(level::stretch(int_u8(), clo), "wsd_02.pgm"); - io::pgm::save(level::transform(wshed, fun::l2l::wrap<int_u8>()), "wsd_03.pgm"); + io::pgm::save(data::stretch(int_u8(), clo), "wsd_02.pgm"); + io::pgm::save(data::transform(wshed, fun::l2l::wrap<int_u8>()), "wsd_03.pgm"); mln_VAR(vol2_, morpho::elementary::dilation(extend(wshed | (pw::value(wshed) == 0u), wshed), c8())); data::fill((wshed | (pw::value(wshed) == 0u)).rw(), vol2_); - io::pgm::save(level::transform(wshed, fun::l2l::wrap<int_u8>()), "wsd_04.pgm"); + io::pgm::save(data::transform(wshed, fun::l2l::wrap<int_u8>()), "wsd_04.pgm"); /// Build graph util::graph g = make::graph(wshed, c4(), nbasins); @@ -309,9 +309,9 @@ } mln_invariant(f(0) == 0u); --nbasins2; // nbasins2 does not count the basin with label 0. - image2d<label_16> wsd2 = level::transform(wshed, f); + image2d<label_16> wsd2 = data::transform(wshed, f); - io::pgm::save(level::transform(wsd2, fun::l2l::wrap<int_u8>()), "wsd_05.pgm"); + io::pgm::save(data::transform(wsd2, fun::l2l::wrap<int_u8>()), "wsd_05.pgm"); /// Reconstruct a graph from the simplified image. util::graph g2 = make::graph(wsd2, c4(), nbasins2); @@ -324,8 +324,8 @@ data::fill((wsd2 | (pw::value(wsd2) == 0u)).rw(), wsd2_); - io::pgm::save(level::transform(labeling::mean_values(dcm, wsd2, nbasins2), fun::l2l::wrap<int_u8>()), "wsd_06_mean_colors.pgm"); - io::pgm::save(level::stretch(int_u8(), make_debug_graph_image(dcm, ima_v2, ima_e2, box_size, 4095)), "wsd_07_graph_image2_white.pgm"); - io::pgm::save(level::stretch(int_u8(), make_debug_graph_image(dcm, ima_v2, ima_e2, box_size, 0)), "wsd_08_graph_image2_black.pgm"); - io::pgm::save(level::transform(wsd2, fun::l2l::wrap<int_u8>()), "wsd_99_result.pgm"); + io::pgm::save(data::transform(labeling::mean_values(dcm, wsd2, nbasins2), fun::l2l::wrap<int_u8>()), "wsd_06_mean_colors.pgm"); + io::pgm::save(data::stretch(int_u8(), make_debug_graph_image(dcm, ima_v2, ima_e2, box_size, 4095)), "wsd_07_graph_image2_white.pgm"); + io::pgm::save(data::stretch(int_u8(), make_debug_graph_image(dcm, ima_v2, ima_e2, box_size, 0)), "wsd_08_graph_image2_black.pgm"); + io::pgm::save(data::transform(wsd2, fun::l2l::wrap<int_u8>()), "wsd_99_result.pgm"); } Index: fabien/igr/matlab.cc --- fabien/igr/matlab.cc (revision 3923) +++ fabien/igr/matlab.cc (working copy) @@ -17,7 +17,7 @@ #include <mln/arith/all.hh> #include <mln/data/fill.hh> #include <mln/data/paste.hh> -#include <mln/level/compute.hh> +#include <mln/data/compute.hh> #include <mln/math/abs.hh> #include <mln/pw/all.hh> #include <mln/trait/concrete.hh> @@ -81,7 +81,7 @@ // calculé sur la première image image2d<bool> roi_noise; // FIXME: init this ROI, should be a domain accu::count<bool> accu_nbrpix1; - unsigned nbrpix1 = level::compute(accu_nbrpix1, roi_noise); + unsigned nbrpix1 = data::compute(accu_nbrpix1, roi_noise); image2d<float> datasli = arr_ima[0]; image2d<float> prodsignal1; @@ -94,7 +94,7 @@ // // ///////////// accu::mean<float> accu_mean; - float moysignal1 = level::compute(accu_mean, prodsignal1 | pw::value(roi_noise) == pw::cst(true)); + float moysignal1 = data::compute(accu_mean, prodsignal1 | pw::value(roi_noise) == pw::cst(true)); //////////////// // // Index: fabien/igr/graph.cc --- fabien/igr/graph.cc (revision 3923) +++ fabien/igr/graph.cc (working copy) @@ -46,7 +46,7 @@ #include <mln/accu/compute.hh> #include <mln/core/alias/dpoint2d.hh> #include <mln/draw/box.hh> -#include <mln/level/stretch.hh> +#include <mln/data/stretch.hh> #include <mln/fun/v2v/id.hh> #include <mln/fun/l2l/wrap.hh> #include <mln/core/image/line_graph_elt_neighborhood.hh> @@ -130,7 +130,7 @@ convert::from_to(m_3f, m); m[0] = 150u; - /*io::ppm::save(level::transform(w, + /*io::ppm::save(data::transform(w, convert::to< fun::i2v::array<mln_value(I)> >(m)), "wst_rag_wshd_color.ppm");*/ @@ -305,7 +305,7 @@ } mln_invariant(f(0) == 0u); --nbasins2; // nbasins2 does not count the basin with label 0. - image2d<label_16> wsd2 = level::transform(wshed, f); + image2d<label_16> wsd2 = data::transform(wshed, f); /// Reconstruct a graph from the simplified image. util::graph g2 = make::graph(wsd2, c4(), nbasins2); @@ -320,8 +320,8 @@ mln_VAR(wsd2_, morpho::elementary::dilation(extend(wsd2 | (pw::value(wsd2) == 0u), wsd2), c8())); data::fill((wsd2 | (pw::value(wsd2) == 0u)).rw(), wsd2_); - mln_VAR(original, level::stretch(int_u8(), labeling::mean_values(dcm, wshed, nbasins))); - mln_VAR(mean, level::stretch(int_u8(), labeling::mean_values(dcm, wsd2, nbasins2))); + mln_VAR(original, data::stretch(int_u8(), labeling::mean_values(dcm, wshed, nbasins))); + mln_VAR(mean, data::stretch(int_u8(), labeling::mean_values(dcm, wsd2, nbasins2))); io::pgm::save(original, "wsd_original.pgm"); io::pgm::save(mean, "wsd_mean_colors.pgm"); io::ppm::save(labeling::colorize(rgb8(), wshed, nbasins), "wsd_colorize_01.ppm"); Index: fabien/igr/time_smooth/morpho.cc --- fabien/igr/time_smooth/morpho.cc (revision 3923) +++ fabien/igr/time_smooth/morpho.cc (working copy) @@ -20,8 +20,8 @@ /*#include <mln/draw/line.hh> #include <mln/io/magick/save.hh> -#include <mln/level/convert.hh> -#include <mln/level/stretch.hh> +#include <mln/data/convert.hh> +#include <mln/data/stretch.hh> #include <mln/value/int_u8.hh> #include <mln/value/rgb8.hh> #include <mln/literal/all.hh> @@ -82,7 +82,7 @@ // Outputs // // // ///////////// - /*image2d<rgb8> ima_color = level::convert(rgb8(), level::stretch(int_u8(), slice(input, 0))); + /*image2d<rgb8> ima_color = data::convert(rgb8(), level::stretch(int_u8(), slice(input, 0))); algebra::vec<2, unsigned int> vmin; algebra::vec<2, unsigned int> vmax; vmin[0] = 160; Index: fabien/igr/med.cc --- fabien/igr/med.cc (revision 3923) +++ fabien/igr/med.cc (working copy) @@ -23,7 +23,7 @@ #include <mln/histo/compute.hh> #include <mln/labeling/compute.hh> #include <mln/labeling/mean_values.hh> -#include <mln/level/compute.hh> +#include <mln/data/compute.hh> #include <mln/morpho/elementary/dilation.hh> #include <mln/pw/all.hh> #include <mln/util/array.hh> @@ -87,7 +87,7 @@ image1d<unsigned> ima_histo; convert::from_to(histogram, ima_histo); accu::median_h<int_u12> accu_med; - median = level::compute(accu_med, ima_histo | pw::value(ima_histo) != pw::cst(0)); + median = data::compute(accu_med, ima_histo | pw::value(ima_histo) != pw::cst(0)); for (int i = 0; i < histogram.nvalues(); ++i) { @@ -123,7 +123,7 @@ image1d<unsigned> ima_histo; convert::from_to(histogram, ima_histo); accu::median_h<int_u12> accu_med; - median = level::compute(accu_med, ima_histo | pw::value(ima_histo) != pw::cst(0)); + median = data::compute(accu_med, ima_histo | pw::value(ima_histo) != pw::cst(0)); for (int i = 0; i < histogram.nvalues(); ++i) { Index: fabien/igr/fixed_seg/main.cc --- fabien/igr/fixed_seg/main.cc (revision 3923) +++ fabien/igr/fixed_seg/main.cc (working copy) @@ -32,9 +32,9 @@ #include <mln/fun/v2v/fit.hh> #include <mln/labeling/compute.hh> #include <mln/labeling/wrap.hh> -#include <mln/level/compute.hh> -#include <mln/level/convert.hh> -#include <mln/level/stretch.hh> +#include <mln/data/compute.hh> +#include <mln/data/convert.hh> +#include <mln/data/stretch.hh> #include <mln/make/image2d.hh> #include <mln/make/w_window1d.hh> #include <mln/math/diff_abs.hh> @@ -138,10 +138,10 @@ accu::sum<V> accu_sum; convert::from_to(v1, tmp_ima); - float sum_v1 = level::compute(accu_sum, tmp_ima); + float sum_v1 = data::compute(accu_sum, tmp_ima); convert::from_to(v2, tmp_ima2); - float sum_v2 = level::compute(accu_sum, tmp_ima2); + float sum_v2 = data::compute(accu_sum, tmp_ima2); if (sum_v1 == 0 && sum_v2 == 0) return 1; @@ -173,14 +173,14 @@ image1d<float> morpho_ima = mean_image(tmp_ima, 15); morpho_ima = mean_image(morpho_ima, 11); morpho_ima = mean_image(morpho_ima, 7); - float sum_v1 = level::compute(accu_sum, morpho_ima); + float sum_v1 = data::compute(accu_sum, morpho_ima); image1d<V> tmp_ima2; convert::from_to(v2, tmp_ima2); image1d<float> morpho_ima2 = mean_image(tmp_ima2, 15); morpho_ima2 = mean_image(tmp_ima2, 11); morpho_ima2 = mean_image(tmp_ima2, 7); - float sum_v2 = level::compute(accu_sum, morpho_ima2); + float sum_v2 = data::compute(accu_sum, morpho_ima2); mln_piter(image1d<float>) p(morpho_ima.domain()); for_all(p) @@ -292,7 +292,7 @@ for (unsigned i = 1; i < means.nelements(); ++i) data::fill((ima_means | pw::value(ima_means) == pw::cst(i)).rw(), means[i]); mln_VAR(display_means, world::inter_pixel::display_edge(ima_means.unmorph_(), 0.0, 3)); - io::pgm::save(level::stretch(int_u8(), display_means), "04_means.pgm"); + io::pgm::save(data::stretch(int_u8(), display_means), "04_means.pgm"); }*/ /*typedef accu::mean<int_u12,float,int_u12> A; @@ -307,7 +307,7 @@ if (m_[l] < 2) m_[l] == 2; // basin <=> 2..255 } - mln_VAR(d_m, level::transform(wst, m_)); + mln_VAR(d_m, data::transform(wst, m_)); mln_VAR(out, world::inter_pixel::display_edge(d_m.unmorph_(), 0, // background <=> 0 3)); Index: fabien/igr/dist_edges.cc --- fabien/igr/dist_edges.cc (revision 3923) +++ fabien/igr/dist_edges.cc (working copy) @@ -19,9 +19,9 @@ #include <mln/accu/sum.hh> #include <mln/arith/div.hh> #include <mln/convert/from_to.hh> -#include <mln/level/compute.hh> -#include <mln/level/convert.hh> -#include <mln/level/stretch.hh> +#include <mln/data/compute.hh> +#include <mln/data/convert.hh> +#include <mln/data/stretch.hh> #include <mln/make/image2d.hh> #include <mln/math/diff_abs.hh> #include <mln/morpho/dilation.hh> @@ -85,10 +85,10 @@ accu::sum<V> accu_sum; convert::from_to(v1, tmp_ima); - float sum_v1 = level::compute(accu_sum, tmp_ima); + float sum_v1 = data::compute(accu_sum, tmp_ima); convert::from_to(v2, tmp_ima2); - float sum_v2 = level::compute(accu_sum, tmp_ima2); + float sum_v2 = data::compute(accu_sum, tmp_ima2); if (sum_v1 == 0 && sum_v2 == 0) return 1; Index: fabien/igr/igr.cc --- fabien/igr/igr.cc (revision 3923) +++ fabien/igr/igr.cc (working copy) @@ -55,13 +55,13 @@ #include <mln/labeling/fill_holes.hh> #include <mln/labeling/n_max.hh> -#include <mln/level/compare.hh> -#include <mln/level/transform.hh> +#include <mln/data/compare.hh> +#include <mln/data/transform.hh> #include <mln/fun/internal/selector.hh> #include <mln/fun/v2b/threshold.hh> -#include <mln/level/transform.hh> +#include <mln/data/transform.hh> #include <mln/accu/count.hh> #include <mln/accu/center.hh> #include <mln/set/compute.hh> @@ -106,7 +106,7 @@ // Threshold. - mln_ch_value(I, bool) threshold = level::transform(input, fun::v2b::threshold<int_u8>(25)); + mln_ch_value(I, bool) threshold = data::transform(input, fun::v2b::threshold<int_u8>(25)); // Labeling. @@ -133,7 +133,7 @@ mln_ch_value(I, bool) gradient = morpho::elementary::gradient_internal(big_second, nbh); mln_VAR(gradient_map, gradient | pw::value(gradient) == true); - mln_ch_value(I, rgb8) result = level::convert(rgb8(), input); + mln_ch_value(I, rgb8) result = data::convert(rgb8(), input); data::fill((result | gradient_map.domain()).rw(), literal::red); // Center. Index: fabien/igr/mean_slices.cc --- fabien/igr/mean_slices.cc (revision 3923) +++ fabien/igr/mean_slices.cc (working copy) @@ -27,7 +27,7 @@ #include <mln/accu/median_h.hh> #include <mln/labeling/relabel.hh> #include <mln/labeling/mean_values.hh> -#include <mln/level/compute.hh> +#include <mln/data/compute.hh> #include <mln/make/image3d.hh> #include <mln/morpho/elementary/dilation.hh> #include <mln/pw/all.hh> Index: fabien/igr/nbasins_finder.cc --- fabien/igr/nbasins_finder.cc (revision 3923) +++ fabien/igr/nbasins_finder.cc (working copy) @@ -18,8 +18,8 @@ #include <mln/labeling/regional_minima.hh> -#include <mln/level/transform.hh> -#include <mln/level/stretch.hh> +#include <mln/data/transform.hh> +#include <mln/data/stretch.hh> #include <mln/morpho/elementary/gradient.hh> #include <mln/morpho/closing/volume.hh> @@ -72,8 +72,8 @@ // Visualization std::cout << " nbasins = " << nbasins << std::endl; - //io::dump::save(level::transform(wshed, fun::l2l::wrap<int_u8>()), "result_nbasins.dump"); - //io::dump::save(level::stretch(int_u8(), wshed), "result_nbasins.dump"); + //io::dump::save(data::transform(wshed, fun::l2l::wrap<int_u8>()), "result_nbasins.dump"); + //io::dump::save(data::stretch(int_u8(), wshed), "result_nbasins.dump"); io::dump::save(labeling::colorize(rgb8(), wshed, nbasins), "result_nbasins.dump"); return 0; Index: fabien/igr/filter.cc --- fabien/igr/filter.cc (revision 3923) +++ fabien/igr/filter.cc (working copy) @@ -32,9 +32,9 @@ #include <mln/fun/v2v/fit.hh> #include <mln/labeling/compute.hh> #include <mln/labeling/wrap.hh> -#include <mln/level/compute.hh> -#include <mln/level/convert.hh> -#include <mln/level/stretch.hh> +#include <mln/data/compute.hh> +#include <mln/data/convert.hh> +#include <mln/data/stretch.hh> #include <mln/make/image2d.hh> #include <mln/make/w_window1d.hh> #include <mln/math/diff_abs.hh> @@ -114,10 +114,10 @@ accu::sum<V> accu_sum; convert::from_to(v1, tmp_ima); - float sum_v1 = level::compute(accu_sum, tmp_ima); + float sum_v1 = data::compute(accu_sum, tmp_ima); convert::from_to(v2, tmp_ima2); - float sum_v2 = level::compute(accu_sum, tmp_ima2); + float sum_v2 = data::compute(accu_sum, tmp_ima2); if (sum_v1 == 0 && sum_v2 == 0) return 1; @@ -149,14 +149,14 @@ image1d<float> morpho_ima = mean_image(tmp_ima, 15); morpho_ima = mean_image(morpho_ima, 11); morpho_ima = mean_image(morpho_ima, 7); - float sum_v1 = level::compute(accu_sum, morpho_ima); + float sum_v1 = data::compute(accu_sum, morpho_ima); image1d<V> tmp_ima2; convert::from_to(v2, tmp_ima2); image1d<float> morpho_ima2 = mean_image(tmp_ima2, 15); morpho_ima2 = mean_image(tmp_ima2, 11); morpho_ima2 = mean_image(tmp_ima2, 7); - float sum_v2 = level::compute(accu_sum, morpho_ima2); + float sum_v2 = data::compute(accu_sum, morpho_ima2); mln_piter(image1d<float>) p(morpho_ima.domain()); for_all(p) Index: fabien/level.hh --- fabien/level.hh (revision 3923) +++ fabien/level.hh (working copy) @@ -148,15 +148,15 @@ level(const Image<I>& input, const mln_value(I)& val, const Neighborhood<N>& nbh, L& nlabels) { - trace::entering("labeling::level"); + trace::entering("labeling::value"); - internal::level_tests(input, val, nbh, nlabels); + internal::data_tests(input, val, nbh, nlabels); mln_ch_value(I, L) output; - impl::level_functor<I> f(input, val); + impl::data_functor<I> f(input, val); output = canvas::labeling_video(input, nbh, nlabels, f); - trace::exiting("labeling::level"); + trace::exiting("labeling::value"); return output; } Index: fabien/regional_minima.hh --- fabien/regional_minima.hh (revision 3923) +++ fabien/regional_minima.hh (working copy) @@ -39,7 +39,7 @@ # include "labeling.hh" # include <mln/data/fill.hh> -# include <mln/level/sort_psites.hh> +# include <mln/data/sort_psites.hh> namespace mln Index: fabien/bin/dump_mask.cc --- fabien/bin/dump_mask.cc (revision 3923) +++ fabien/bin/dump_mask.cc (working copy) @@ -16,7 +16,7 @@ #include <mln/literal/colors.hh> #include <mln/morpho/elementary/gradient_internal.hh> -#include <mln/level/transform.hh> +#include <mln/data/transform.hh> #include <mln/fun/v2b/threshold.hh> #include <mln/data/fill.hh> @@ -42,7 +42,7 @@ image3d<int_u8> input; io::dump::load(input, argv[1]); - image3d<bool> ima = level::transform(input, fun::v2b::threshold<int_u8>(1)); + image3d<bool> ima = data::transform(input, fun::v2b::threshold<int_u8>(1)); mln_VAR(grad_int, morpho::elementary::gradient_internal(ima, c6())); util::array<unsigned> xproj(ima.nrows(), 0); Index: fabien/bin/dicom_mask.cc --- fabien/bin/dicom_mask.cc (revision 3923) +++ fabien/bin/dicom_mask.cc (working copy) @@ -13,7 +13,7 @@ #include <mln/literal/colors.hh> #include <mln/morpho/elementary/gradient_internal.hh> -#include <mln/level/transform.hh> +#include <mln/data/transform.hh> #include <mln/fun/v2b/threshold.hh> #include <mln/data/fill.hh> @@ -59,7 +59,7 @@ fout_ysrc << i << " " << ysrcproj[i] << std::endl; } - image2d<bool> ima = level::transform(input, fun::v2b::threshold<int_u8>(1)); + image2d<bool> ima = data::transform(input, fun::v2b::threshold<int_u8>(1)); io::pbm::save(ima, argv[2]); mln_VAR(grad_int, morpho::elementary::gradient_internal(ima, c4())); Index: fabien/bin/dumpi12_to_pgm.cc --- fabien/bin/dumpi12_to_pgm.cc (revision 3923) +++ fabien/bin/dumpi12_to_pgm.cc (working copy) @@ -8,7 +8,7 @@ #include <mln/io/dump/load.hh> #include <mln/io/pgm/save.hh> -#include <mln/level/stretch.hh> +#include <mln/data/stretch.hh> int usage(char* argv[]) @@ -41,14 +41,14 @@ { image2d<int_u12> ima2d; io::dump::load(ima2d, argv[1]); - image2d<int_u8> ima_pgm = level::stretch(int_u8(), ima2d); + image2d<int_u8> ima_pgm = data::stretch(int_u8(), ima2d); io::pgm::save(ima_pgm, argv[3]); } else { image3d<int_u12> ima3d; io::dump::load(ima3d, argv[1]); - image3d<int_u8> ima_pgm = level::stretch(int_u8(), ima3d); + image3d<int_u8> ima_pgm = data::stretch(int_u8(), ima3d); image2d<int_u8> ima_result = debug::slices_2d(ima_pgm, 1.f, 0); io::pgm::save(ima_result, argv[3]); Index: fabien/binarization/test.cc --- fabien/binarization/test.cc (revision 3923) +++ fabien/binarization/test.cc (working copy) @@ -15,8 +15,8 @@ #include <mln/io/magick/all.hh> -#include <mln/level/convert.hh> -#include <mln/level/stretch.hh> +#include <mln/data/convert.hh> +#include <mln/data/stretch.hh> #include <mln/literal/colors.hh> @@ -88,7 +88,7 @@ image1d<int> ima_lines; convert::from_to(inter_lines, ima_lines); accu::median_h<int_u12> accu_med; - median = level::compute(accu_med, ima_lines); + median = data::compute(accu_med, ima_lines); // Gnuplot files creation /*std::ofstream fout_row("row.plot"); @@ -113,7 +113,7 @@ image2d<bool> ima; io::magick::load(ima, argv[1]); - image2d<rgb8> ima_color = level::convert(rgb8(), ima); + image2d<rgb8> ima_color = data::convert(rgb8(), ima); //image2d<int_u8> ima_sampled = world::binary_2d::subsample(ima, 3); //io::pgm::save(ima_sampled, argv[2]); Index: fabien/regional_maxima.hh --- fabien/regional_maxima.hh (revision 3923) +++ fabien/regional_maxima.hh (working copy) @@ -39,7 +39,7 @@ # include "labeling.hh" # include <mln/data/fill.hh> -# include <mln/level/sort_psites.hh> +# include <mln/data/sort_psites.hh> namespace mln Index: fabien/labeling.hh --- fabien/labeling.hh (revision 3923) +++ fabien/labeling.hh (working copy) @@ -41,8 +41,8 @@ # include <mln/convert/to_upper_window.hh> # include <mln/extension/adjust_fill.hh> -# include <mln/level/sort_psites.hh> -# include <mln/level/sort_offsets.hh> +# include <mln/data/sort_psites.hh> +# include <mln/data/sort_offsets.hh> namespace mln @@ -511,8 +511,8 @@ { p_array<mln_psite(I)> s = increasing ? - level::sort_psites_increasing(input) : - level::sort_psites_decreasing(input); + data::sort_psites_increasing(input) : + data::sort_psites_decreasing(input); return impl::generic::labeling(input, nbh, nlabels, s, functor); } @@ -526,8 +526,8 @@ { util::array<unsigned> s = increasing ? - level::sort_offsets_increasing(input) : - level::sort_offsets_decreasing(input); + data::sort_offsets_increasing(input) : + data::sort_offsets_decreasing(input); return impl::labeling_sorted_fastest(input, nbh, nlabels, s, functor); } Index: fabien/level.cc --- fabien/level.cc (revision 3923) +++ fabien/level.cc (working copy) @@ -28,7 +28,7 @@ /// \file tests/labeling/level.cc /// -/// Test on mln::labeling::level. +/// Test on mln::labeling::value. #include <mln/core/image/image2d.hh> #include <mln/core/alias/neighb2d.hh> @@ -59,7 +59,7 @@ unsigned n, npixels = 0; for (unsigned l = 0; l <= 255; ++l) { - image2d<unsigned> labels = labeling::level(lena, l, c4(), n); + image2d<unsigned> labels = labeling::value(lena, l, c4(), n); unsigned npix = accu::compute(accu::meta::count(), labels | (pw::value(labels) != pw::cst(0u))); Index: jardonnet/n_cmpt/tikz.hh --- jardonnet/n_cmpt/tikz.hh (revision 3923) +++ jardonnet/n_cmpt/tikz.hh (working copy) @@ -44,7 +44,7 @@ # include <mln/morpho/tree/compute_attribute_image.hh> # include <mln/data/paste.hh> -#include <mln/level/transform.hh> +#include <mln/data/transform.hh> namespace mln { @@ -111,14 +111,14 @@ typedef mln_ch_value(I, value::int_u<16>) V; typedef accu::volume<I> A; - S sp = level::sort_psites_decreasing(ima); + S sp = data::sort_psites_decreasing(ima); morpho::tree::data<I,S> t(ima, sp, nbh); V volume(ima.domain()); data::paste(morpho::tree::compute_attribute_image(A(), t), volume); - sp = level::sort_psites_increasing(volume); + sp = data::sort_psites_increasing(volume); std::cout << "/volume/" << std::endl; debug::println(volume); io::tikz::save(volume, "volume.tex"); @@ -271,7 +271,7 @@ tik(d) = tik(parent(d)); } - //mln_ch_value(I, value::rgb8) tik_rgb = level::transform(tik, col); + //mln_ch_value(I, value::rgb8) tik_rgb = data::transform(tik, col); //tik_rgb(p) = literal::red; tik(p) = 255; Index: jardonnet/n_cmpt/nwst.hh --- jardonnet/n_cmpt/nwst.hh (revision 3923) +++ jardonnet/n_cmpt/nwst.hh (working copy) @@ -81,7 +81,7 @@ // sort ima psites typedef mln_psite(I) P; typedef p_array<P> S; - S sp = level::sort_psites_increasing(ima); + S sp = data::sort_psites_increasing(ima); // init watershed image mln_ch_value(I, value::rgb8) wst(ima.domain()); Index: jardonnet/n_cmpt/test_attribute_watershed.cc --- jardonnet/n_cmpt/test_attribute_watershed.cc (revision 3923) +++ jardonnet/n_cmpt/test_attribute_watershed.cc (working copy) @@ -49,7 +49,7 @@ typedef mln_ch_value_(I,unsigned) V; typedef accu::volume<I> A; - S sp = level::sort_psites_decreasing(ima); + S sp = data::sort_psites_decreasing(ima); morpho::tree::data<I,S> t(ima, sp, c4()); V volume = morpho::tree::compute_attribute_image(A(), t); Index: jardonnet/n_cmpt/fused_filter.cc --- jardonnet/n_cmpt/fused_filter.cc (revision 3923) +++ jardonnet/n_cmpt/fused_filter.cc (working copy) @@ -4,7 +4,7 @@ #include <mln/debug/println.hh> #include <mln/core/site_set/p_array.hh> -#include <mln/level/sort_psites.hh> +#include <mln/data/sort_psites.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/morpho/tree/data.hh> @@ -62,7 +62,7 @@ debug::println("f =", f); typedef p_array<mln_psite(I)> S; - S s = level::sort_psites_increasing(a); + S s = data::sort_psites_increasing(a); // s maps increasing attributes. mln_ch_value(I, mln_site(I)) par; @@ -237,7 +237,7 @@ usage(argv); typedef p_array<point2d> S; - S s = level::sort_psites_decreasing(f); + S s = data::sort_psites_decreasing(f); // Children go towards lower levels so leafs are regional minima. // We get a min-tree so that we can perform morphological closings. Index: jardonnet/n_cmpt/n_cmpt2.hh --- jardonnet/n_cmpt/n_cmpt2.hh (revision 3923) +++ jardonnet/n_cmpt/n_cmpt2.hh (working copy) @@ -30,7 +30,7 @@ # include <mln/data/fill.hh> # include <mln/core/site_set/p_vaccess.hh> -# include <mln/level/sort_psites.hh> +# include <mln/data/sort_psites.hh> # include <mln/accu/volume.hh> # include <mln/morpho/tree/data.hh> # include <mln/morpho/tree/compute_attribute_image.hh> @@ -74,7 +74,7 @@ // compute volume image typedef p_array<mln_psite(I)> S; typedef accu::volume<I> A; - S sp = level::sort_psites_increasing(input); + S sp = data::sort_psites_increasing(input); morpho::tree::data<I,S> t(input, sp, c4()); image2d<unsigned> volume = morpho::tree::compute_attribute_image(A(), t); Index: jardonnet/n_cmpt/n_cmpt3.hh --- jardonnet/n_cmpt/n_cmpt3.hh (revision 3923) +++ jardonnet/n_cmpt/n_cmpt3.hh (working copy) @@ -81,10 +81,10 @@ typedef mln_ch_value(I,unsigned) V; typedef accu::volume<I> A; - S sp = level::sort_psites_decreasing(ima); + S sp = data::sort_psites_decreasing(ima); morpho::tree::data<I,S> t(ima, sp, nbh); V volume = morpho::tree::compute_attribute_image(A(), t); - sp = level::sort_psites_increasing(volume); + sp = data::sort_psites_increasing(volume); std::cout << "/volume/" << std::endl; debug::println(volume); Index: jardonnet/n_cmpt/n_cmpt4.hh --- jardonnet/n_cmpt/n_cmpt4.hh (revision 3923) +++ jardonnet/n_cmpt/n_cmpt4.hh (working copy) @@ -81,10 +81,10 @@ typedef mln_ch_value(I,unsigned) V; typedef accu::volume<I> A; - S sp = level::sort_psites_decreasing(ima); + S sp = data::sort_psites_decreasing(ima); morpho::tree::data<I,S> t(ima, sp, nbh); V volume = morpho::tree::compute_attribute_image(A(), t); - sp = level::sort_psites_increasing(volume); + sp = data::sort_psites_increasing(volume); std::cout << "/volume/" << std::endl; debug::println(volume); Index: jardonnet/n_cmpt/n_cmpt5.hh --- jardonnet/n_cmpt/n_cmpt5.hh (revision 3923) +++ jardonnet/n_cmpt/n_cmpt5.hh (working copy) @@ -81,10 +81,10 @@ typedef mln_ch_value(I,unsigned) V; typedef accu::volume<I> A; - S sp = level::sort_psites_decreasing(ima); + S sp = data::sort_psites_decreasing(ima); morpho::tree::data<I,S> t(ima, sp, nbh); V volume = morpho::tree::compute_attribute_image(A(), t); - sp = level::sort_psites_increasing(volume); + sp = data::sort_psites_increasing(volume); std::cout << "/volume/" << std::endl; debug::println(volume); Index: jardonnet/n_cmpt/ref_filter.cc --- jardonnet/n_cmpt/ref_filter.cc (revision 3923) +++ jardonnet/n_cmpt/ref_filter.cc (working copy) @@ -4,7 +4,7 @@ #include <mln/debug/println.hh> #include <mln/core/site_set/p_array.hh> -#include <mln/level/sort_psites.hh> +#include <mln/data/sort_psites.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/morpho/tree/data.hh> @@ -58,7 +58,7 @@ debug::println("f =", f); typedef p_array<mln_psite(I)> S; - S s = level::sort_psites_increasing(a); + S s = data::sort_psites_increasing(a); // s maps increasing attributes. mln_ch_value(I, mln_site(I)) par; @@ -210,7 +210,7 @@ usage(argv); typedef p_array<point2d> S; - S s = level::sort_psites_decreasing(f); + S s = data::sort_psites_decreasing(f); // Children go towards lower levels so leafs are regional minima. // We get a min-tree so that we can perform morphological closings. Index: jardonnet/n_cmpt/n_cmpt.hh --- jardonnet/n_cmpt/n_cmpt.hh (revision 3923) +++ jardonnet/n_cmpt/n_cmpt.hh (working copy) @@ -32,7 +32,7 @@ # include <mln/core/concept/neighborhood.hh> # include <mln/data/fill.hh> # include <mln/util/pix.hh> -# include <mln/level/sort_psites.hh> +# include <mln/data/sort_psites.hh> # include <mln/accu/count.hh> # include <mln/accu/volume.hh> @@ -80,7 +80,7 @@ typedef mln_psite(I) P; typedef p_array<P> S; - const S s(level::sort_psites_increasing(input)); + const S s(data::sort_psites_increasing(input)); // Auxiliary data. mln_ch_value(O, bool) deja_vu; Index: jardonnet/igr/src/igr.cc --- jardonnet/igr/src/igr.cc (revision 3923) +++ jardonnet/igr/src/igr.cc (working copy) @@ -17,7 +17,7 @@ #include <mln/io/pgm/save.hh> #include <mln/data/paste.hh> -#include <mln/level/apply.hh> +#include <mln/data/apply.hh> #include <mln/fun/v2v/rgb_to_hsi.hh> #include <mln/fun/v2v/abs.hh> @@ -51,7 +51,7 @@ // RGB -> GS //////////////////// - image2d<hsi_f> hsi = level::transform(ima, fun::v2v::f_rgb_to_hsi_f); + image2d<hsi_f> hsi = data::transform(ima, fun::v2v::f_rgb_to_hsi_f); //FIXME: fix and use alexandre stuff /* thru<to_hsi, image2d<hsi_f> > tmp(hsi_f); @@ -74,7 +74,7 @@ image2d<int_u8> mg_ima(g_ima.domain()); mg_ima = morpho::elementary::gradient(g_ima, c4()); - //level::apply(mg_ima, fun::v2v::abs<int_u8>()); + //data::apply(mg_ima, fun::v2v::abs<int_u8>()); io::pgm::save(mg_ima, "mg_ima.ppm"); Index: dalila/plop.cc --- dalila/plop.cc (revision 3923) +++ dalila/plop.cc (working copy) @@ -7,8 +7,8 @@ image2d<bool> ima1(2, 3); image2d<bool> ima2(2, 3); - level::fill(ima1, 2); - level::fill(ima2, 3); + data::fill(ima1, 2); + data::fill(ima2, 3); // debug::println(ima1); // debug::println(ima2); Index: garrigues/level_set.hh --- garrigues/level_set.hh (revision 3923) +++ garrigues/level_set.hh (working copy) @@ -60,7 +60,7 @@ # include <mln/border/fill.hh> -# include <mln/level/compute.hh> +# include <mln/data/compute.hh> # include <mln/data/fill.hh> # include <mln/accu/min.hh> # include <mln/accu/max.hh> @@ -83,8 +83,8 @@ # include <mln/util/tree_to_image.hh> # include <mln/value/int_u8.hh> -# include <mln/level/stretch.hh> -# include <mln/level/compare.hh> +# include <mln/data/stretch.hh> +# include <mln/data/compare.hh> # include <mln/io/pgm/save.hh> namespace mln @@ -290,7 +290,7 @@ // gn <- min u(x) x belongs to N. if ((env.u | set::inter(env.N, env.u.domain())).nsites() > 0) - env.gn = level::compute< typename F::accu_for_gn >(env.u | set::inter(env.N, env.u.domain())); + env.gn = data::compute< typename F::accu_for_gn >(env.u | set::inter(env.N, env.u.domain())); else { finished = true; @@ -351,7 +351,7 @@ border_ima(z) = true; } unsigned n; - labeling::level(border_ima, true, F::bdr_nbh(), tmp, n); + labeling::value(border_ima, true, F::bdr_nbh(), tmp, n); // std::cout << "labeling : " << n << std::endl; // std::cout << "nous : " << env.n_cc << std::endl; @@ -367,7 +367,7 @@ // follow each border to find which is the exterior border // and which are the holes. Keep one pixel of each holes. - // WARNING : We trust labeling::level to label the exterior border with 1. + // WARNING : We trust labeling::value to label the exterior border with 1. env.current_region->elt().holes.insert(a_point_of(tmp | pw::value(tmp) == pw::cst(i))); // FIXME : [optimisation] Remove from N border of holes???. Index: garrigues/fllt/fllt_simple.svg.3.cc --- garrigues/fllt/fllt_simple.svg.3.cc (revision 3923) +++ garrigues/fllt/fllt_simple.svg.3.cc (working copy) @@ -41,7 +41,7 @@ #include <mln/io/pgm/save.hh> #include <mln/data/fill.hh> -#include <mln/level/compare.hh> +#include <mln/data/compare.hh> #include <mln/debug/println.hh> #include <mln/labeling/regional_minima.hh> #include <mln/accu/bbox.hh> Index: garrigues/fllt/fllt_simple.cc --- garrigues/fllt/fllt_simple.cc (revision 3923) +++ garrigues/fllt/fllt_simple.cc (working copy) @@ -46,7 +46,7 @@ #include <mln/io/pgm/save.hh> #include <mln/data/fill.hh> -#include <mln/level/compare.hh> +#include <mln/data/compare.hh> #include <mln/debug/println.hh> #include <mln/labeling/regional_minima.hh> #include <mln/accu/bbox.hh> Index: garrigues/fllt/compute_level_set_fast2.hh --- garrigues/fllt/compute_level_set_fast2.hh (revision 3923) +++ garrigues/fllt/compute_level_set_fast2.hh (working copy) @@ -133,7 +133,7 @@ finished = tmp.nsites() == 0; if (!finished) - gn = level::compute< typename F::accu_for_gn >(u | tmp.domain()); + gn = data::compute< typename F::accu_for_gn >(u | tmp.domain()); if (finished) gn += F::inc; @@ -254,7 +254,7 @@ // border_ima(z) = true; // } // unsigned n; -// tmp = labeling::level(border_ima, true, F::bdr_nbh(), n); +// tmp = labeling::value(border_ima, true, F::bdr_nbh(), n); // // debug::println(border_ima); // //std::cout << "nb composantes :" << n << std::endl; @@ -268,7 +268,7 @@ // // follow each border to find which is the exterior border // // and which are the holes. Keep one pixel of each holes. -// // WARNING : We trust labeling::level to label the exterior border with 1. +// // WARNING : We trust labeling::value to label the exterior border with 1. // current_region->elt().holes.insert(a_point_of(tmp | pw::value(tmp) == pw::cst(i))); // // FIXME : [optimisation] Remove from N border of holes???. Index: garrigues/fllt/fllt_optimized.hh --- garrigues/fllt/fllt_optimized.hh (revision 3923) +++ garrigues/fllt/fllt_optimized.hh (working copy) @@ -44,8 +44,8 @@ # include <mln/util/tree_to_image.hh> # include <mln/value/int_u8.hh> -# include <mln/level/stretch.hh> -# include <mln/level/compare.hh> +# include <mln/data/stretch.hh> +# include <mln/data/compare.hh> # include <mln/io/pgm/save.hh> namespace mln @@ -143,7 +143,7 @@ image2d<value::int_u8> out(ima.domain()); image2d<value::int_u8> out2(ima.domain()); visualize_deepness(out, tree); - level::stretch(out, out2); + data::stretch(out, out2); io::pgm::save(out2, "fllt_deepnees.pgm"); visualize_bounds(out, tree, 800); Index: garrigues/fllt/debug.hh --- garrigues/fllt/debug.hh (revision 3923) +++ garrigues/fllt/debug.hh (working copy) @@ -151,7 +151,7 @@ // image2d<value::int_u8> viz2(ima.domain()); // visualize_deepness(viz, lower_tree); - // level::stretch(viz, viz2); + // data::stretch(viz, viz2); // debug::println(viz); // debug::println(viz2); // io::pgm::save(viz2, "fllt.pgm"); Index: garrigues/fllt/compute_level_set_fast.hh --- garrigues/fllt/compute_level_set_fast.hh (revision 3923) +++ garrigues/fllt/compute_level_set_fast.hh (working copy) @@ -123,7 +123,7 @@ finished = N.nsites() == 0; if (!finished) - gn = level::compute< typename F::accu_for_gn >(u | N); + gn = data::compute< typename F::accu_for_gn >(u | N); else gn += F::inc; @@ -248,7 +248,7 @@ // border_ima(z) = true; // } // unsigned n; -// tmp = labeling::level(border_ima, true, F::bdr_nbh(), n); +// tmp = labeling::value(border_ima, true, F::bdr_nbh(), n); // // debug::println(border_ima); // //std::cout << "nb composantes :" << n << std::endl; @@ -262,7 +262,7 @@ // // follow each border to find which is the exterior border // // and which are the holes. Keep one pixel of each holes. -// // WARNING : We trust labeling::level to label the exterior border with 1. +// // WARNING : We trust labeling::value to label the exterior border with 1. // current_region->elt().holes.insert(a_point_of(tmp | pw::value(tmp) == pw::cst(i))); // // FIXME : [optimisation] Remove from N border of holes???. Index: garrigues/fllt/fllt.hh --- garrigues/fllt/fllt.hh (revision 3923) +++ garrigues/fllt/fllt.hh (working copy) @@ -51,7 +51,7 @@ # include <mln/border/fill.hh> -# include <mln/level/compute.hh> +# include <mln/data/compute.hh> # include <mln/data/fill.hh> # include <mln/accu/min.hh> # include <mln/accu/max.hh> @@ -74,8 +74,8 @@ # include <mln/util/tree_to_image.hh> # include <mln/value/int_u8.hh> -# include <mln/level/stretch.hh> -# include <mln/level/compare.hh> +# include <mln/data/stretch.hh> +# include <mln/data/compare.hh> # include <mln/io/pgm/save.hh> # include "types.hh" Index: garrigues/fllt/give_confs.cc --- garrigues/fllt/give_confs.cc (revision 3923) +++ garrigues/fllt/give_confs.cc (working copy) @@ -36,11 +36,11 @@ int x, y; - labeling::level(ima, false, c8(), x); + labeling::value(ima, false, c8(), x); ima(p) = true; - labeling::level(ima, false, c8(), y); + labeling::value(ima, false, c8(), y); // std::cout << "----- conf no " << i << "------" << std::endl; // debug::println(ima); Index: garrigues/fllt/compute_level_set.hh --- garrigues/fllt/compute_level_set.hh (revision 3923) +++ garrigues/fllt/compute_level_set.hh (working copy) @@ -114,7 +114,7 @@ // gn <- min u(x) x belongs to N. if ((u | set::inter(N, u.domain())).nsites() > 0) - gn = level::compute< typename F::accu_for_gn >(u | set::inter(N, u.domain())); + gn = data::compute< typename F::accu_for_gn >(u | set::inter(N, u.domain())); else { finished = true; @@ -189,7 +189,7 @@ border_ima(z) = true; } unsigned n; - tmp = labeling::level(border_ima, true, F::bdr_nbh(), n); + tmp = labeling::value(border_ima, true, F::bdr_nbh(), n); // debug::println(border_ima); //std::cout << "nb composantes :" << n << std::endl; @@ -203,7 +203,7 @@ // follow each border to find which is the exterior border // and which are the holes. Keep one pixel of each holes. - // WARNING : We trust labeling::level to label the exterior border with 1. + // WARNING : We trust labeling::value to label the exterior border with 1. current_region->elt().holes.insert(a_point_of(tmp | pw::value(tmp) == pw::cst(i))); // FIXME : [optimisation] Remove from N border of holes???. Index: garrigues/union_find/reconstructions_on_function.hh --- garrigues/union_find/reconstructions_on_function.hh (revision 3923) +++ garrigues/union_find/reconstructions_on_function.hh (working copy) @@ -33,9 +33,9 @@ # include <mln/core/alias/neighb2d.hh> # include <mln/core/routine/duplicate.hh> # include <mln/data/fill.hh> -# include <mln/level/compare.hh> +# include <mln/data/compare.hh> # include <mln/data/paste.hh> -# include <mln/level/sort_psites.hh> +# include <mln/data/sort_psites.hh> # include <mln/literal/zero.hh> # include <mln/math/max.hh> # include <mln/math/min.hh> @@ -62,7 +62,7 @@ : marker(marker), mask(mask), output(output), - s(level::sort_psites_decreasing(mask)) + s(data::sort_psites_decreasing(mask)) { } @@ -94,7 +94,7 @@ : marker(marker), mask(mask), output(output), - s(level::sort_psites_increasing(mask)) + s(data::sort_psites_increasing(mask)) { } Index: garrigues/union_find/reconstructions_on_set.hh --- garrigues/union_find/reconstructions_on_set.hh (revision 3923) +++ garrigues/union_find/reconstructions_on_set.hh (working copy) @@ -33,7 +33,7 @@ # include <mln/core/alias/neighb2d.hh> # include <mln/data/fill.hh> # include <mln/data/paste.hh> -# include <mln/level/compare.hh> +# include <mln/data/compare.hh> # include "canvas/reconstruction_on_set.hh" Index: garrigues/union_find/self_dual_reconstruction.hh --- garrigues/union_find/self_dual_reconstruction.hh (revision 3923) +++ garrigues/union_find/self_dual_reconstruction.hh (working copy) @@ -33,9 +33,9 @@ # include <mln/core/alias/neighb2d.hh> # include <mln/core/routine/duplicate.hh> # include <mln/data/fill.hh> -# include <mln/level/compare.hh> +# include <mln/data/compare.hh> # include <mln/data/paste.hh> -# include <mln/level/sort_psites.hh> +# include <mln/data/sort_psites.hh> # include <mln/literal/zero.hh> # include <mln/math/max.hh> # include <mln/math/min.hh> @@ -71,8 +71,8 @@ : marker(marker), mask(mask), output(output), - d1_s(level::sort_psites_decreasing(mask | (pw::value(marker) <= pw::value(mask)))), - d2_s(level::sort_psites_increasing(mask | (pw::value(marker) > pw::value(mask)))) + d1_s(data::sort_psites_decreasing(mask | (pw::value(marker) <= pw::value(mask)))), + d2_s(data::sort_psites_increasing(mask | (pw::value(marker) > pw::value(mask)))) { } Index: garrigues/factures/extract_array_highlight.cc --- garrigues/factures/extract_array_highlight.cc (revision 3923) +++ garrigues/factures/extract_array_highlight.cc (working copy) @@ -39,8 +39,8 @@ #include <mln/pw/all.hh> -#include <mln/level/stretch.hh> -#include <mln/level/median.hh> +#include <mln/data/stretch.hh> +#include <mln/data/median.hh> #include <mln/morpho/gradient.hh> #include <mln/labeling/level.hh> @@ -63,7 +63,7 @@ { // Labeling. unsigned nlabels; - image2d<unsigned> labels = labeling::level(in, true, c4(), nlabels); + image2d<unsigned> labels = labeling::value(in, true, c4(), nlabels); // Get the caracteristics of the connected components. std::vector< accu::pair_< accu::bbox<point2d>, accu::count_<point2d> > > caracteristics(nlabels + 1); Index: garrigues/factures/extract_array.cc --- garrigues/factures/extract_array.cc (revision 3923) +++ garrigues/factures/extract_array.cc (working copy) @@ -36,7 +36,7 @@ #include <mln/pw/all.hh> -#include <mln/level/stretch.hh> +#include <mln/data/stretch.hh> #include <mln/labeling/level.hh> #include <mln/literal/all.hh> @@ -67,7 +67,7 @@ // Labeling. unsigned nlabels; - image2d<unsigned> labels = labeling::level(bin, true, c4(), nlabels); + image2d<unsigned> labels = labeling::value(bin, true, c4(), nlabels); // Get the caracteristics of the connected components. std::vector< accu::pair_< accu::bbox<point2d>, accu::count_<point2d> > > caracteristics(nlabels); Index: abraham/tests/morpho/test_watershed.cc --- abraham/tests/morpho/test_watershed.cc (revision 3923) +++ abraham/tests/morpho/test_watershed.cc (working copy) @@ -3,7 +3,7 @@ #include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_set.hh> #include <mln/value/int_u8.hh> -#include <mln/level/compare.hh> +#include <mln/data/compare.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> Index: abraham/tests/morpho/test_watershed_topo.cc --- abraham/tests/morpho/test_watershed_topo.cc (revision 3923) +++ abraham/tests/morpho/test_watershed_topo.cc (working copy) @@ -4,7 +4,7 @@ #include <mln/core/site_set/p_set.hh> #include <mln/value/int_u8.hh> -#include <mln/level/compare.hh> +#include <mln/data/compare.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> Index: abraham/mln/morpho/najman_wst.hh --- abraham/mln/morpho/najman_wst.hh (revision 3923) +++ abraham/mln/morpho/najman_wst.hh (working copy) @@ -30,7 +30,7 @@ -#include <mln/level/sort_psites.hh> +#include <mln/data/sort_psites.hh> #include <mln/data/fill.hh> #include <mln/core/image/image2d.hh> #include <mln/core/site_set/p_set.hh> @@ -236,7 +236,7 @@ // Sort the sites in increasing order p_array<mln_site(I)> S; - S = level::sort_psites_increasing(pima); + S = data::sort_psites_increasing(pima); // Clear the marker map data::fill(isproc, false); @@ -552,7 +552,7 @@ { mln::p_priority< mln_value(I), p_queue_fast<site> > L; - mln_value(I) max = level::compute(accu::meta::max(), pima); + mln_value(I) max = data::compute(accu::meta::max(), pima); // I K(pima.domain(), pima.border()); mln_ch_value(I, unsigned) K(pima.domain(), pima.border()); Index: abraham/mln/morpho/basic_najman.hh --- abraham/mln/morpho/basic_najman.hh (revision 3923) +++ abraham/mln/morpho/basic_najman.hh (working copy) @@ -26,7 +26,7 @@ // Public License. -#include <mln/level/sort_psites.hh> +#include <mln/data/sort_psites.hh> #include <mln/data/fill.hh> #include <mln/core/image/image2d.hh> #include <mln/core/site_set/p_set.hh> @@ -158,7 +158,7 @@ void init() { // Sort the sites in increasing order - S = level::sort_psites_increasing(pima); + S = data::sort_psites_increasing(pima); // Clear the marker map data::fill(isproc, false); @@ -526,7 +526,7 @@ { mln::p_priority< mln_value(I), p_queue_fast<site> > L; - mln_value(I) max = level::compute(accu::meta::max(), pima); + mln_value(I) max = data::compute(accu::meta::max(), pima); // I K(pima.domain(), pima.border()); mln_ch_value(I, unsigned) K(pima.domain(), pima.border()); Index: abraham/mln/morpho/topo_wst.hh --- abraham/mln/morpho/topo_wst.hh (revision 3923) +++ abraham/mln/morpho/topo_wst.hh (working copy) @@ -30,7 +30,7 @@ -#include <mln/level/sort_psites.hh> +#include <mln/data/sort_psites.hh> #include <mln/data/fill.hh> #include <mln/core/image/image2d.hh> #include <mln/core/site_set/p_set.hh> @@ -260,7 +260,7 @@ // Sort the sites in increasing order p_array<mln_site(I)> S; - S = level::sort_psites_increasing(ima); + S = data::sort_psites_increasing(ima); // Clear the marker map data::fill(isproc, false); Index: abraham/mln/level/thru.hh --- abraham/mln/level/thru.hh (revision 3923) +++ abraham/mln/level/thru.hh (working copy) @@ -28,7 +28,7 @@ #ifndef MLN_LEVEL_APPLY_HH # define MLN_LEVEL_APPLY_HH -/*! \file mln/level/apply.hh +/*! \file mln/data/apply.hh * * \brief Apply a function-object onto image pixel values. */ @@ -37,13 +37,13 @@ # include <mln/core/concept/function.hh> // Specializations are in: -# include <mln/level/apply.spe.hh> +# include <mln/data/apply.spe.hh> namespace mln { - namespace level + namespace data { /*! Apply a function-object to the image \p input. @@ -54,7 +54,7 @@ * This routine runs: \n * for all p of \p input, \p input(p) = \p f( \p input(p) ) \n * - * This routine is equivalent to level::tranform(input, f, input) + * This routine is equivalent to data::tranform(input, f, input) * but it is faster since a single iterator is required. * * \todo Add versions for lowq images. @@ -76,18 +76,18 @@ inline void apply_(I& input, const F& f) { - trace::entering("level::impl::generic::apply_"); + trace::entering("data::impl::generic::apply_"); mln_piter(I) p(input.domain()); for_all(p) input(p) = f(input(p)); - trace::exiting("level::impl::generic::apply_"); + trace::exiting("data::impl::generic::apply_"); } - } // end of namespace mln::level::impl::generic + } // end of namespace mln::data::impl::generic - } // end of namespace mln::level::impl + } // end of namespace mln::data::impl // Facade. @@ -96,18 +96,18 @@ inline void apply(Image<I>& input, const Function_v2v<F>& f) { - trace::entering("level::apply"); + trace::entering("data::apply"); mln_precondition(exact(input).is_valid()); impl::apply_(mln_trait_image_speed(I)(), exact(input), exact(f)); - trace::exiting("level::apply"); + trace::exiting("data::apply"); } # endif // ! MLN_INCLUDE_ONLY - } // end of namespace mln::level + } // end of namespace mln::data } // end of namespace mln Index: inim/2010/boxes/boxes.cc --- inim/2010/boxes/boxes.cc (revision 3923) +++ inim/2010/boxes/boxes.cc (working copy) @@ -168,7 +168,7 @@ << " boxes" << std::endl; /// Save grouped text image - io::pgm::save(level::transform(grouped_text.label_image(), + io::pgm::save(data::transform(grouped_text.label_image(), fun::v2v::wrap<value::int_u8>()), "words.pgm"); @@ -210,7 +210,7 @@ scribo::make::debug_filename("boxes.ppm")); /// Does not seem to work (FIXME) - io::pgm::save(level::transform(grouped_lines.label_image(), + io::pgm::save(data::transform(grouped_lines.label_image(), fun::l2l::wrap<value::int_u8>()), "fixme.ppm"); Index: inim/2010/morpho/main_dilation-n.cc --- inim/2010/morpho/main_dilation-n.cc (revision 3923) +++ inim/2010/morpho/main_dilation-n.cc (working copy) @@ -7,8 +7,8 @@ #include <mln/io/pbm/load.hh> #include <mln/io/pgm/save.hh> -#include <mln/level/convert.hh> -#include <mln/level/stretch.hh> +#include <mln/data/convert.hh> +#include <mln/data/stretch.hh> #include <mln/core/alias/window2d.hh> @@ -33,8 +33,8 @@ io::pbm::load(in, argv[1]); value::int_u8 k = 1; - image2d<value::int_u8> ima = level::convert(k, in); - ima = level::stretch(k, ima); + image2d<value::int_u8> ima = data::convert(k, in); + ima = data::stretch(k, ima); std::cout << " => create window..." << std::endl; window2d it; Index: inim/2010/morpho/morpho.cc --- inim/2010/morpho/morpho.cc (revision 3923) +++ inim/2010/morpho/morpho.cc (working copy) @@ -8,8 +8,8 @@ #include <mln/io/pbm/load.hh> #include <mln/io/pgm/save.hh> #include <mln/labeling/regional_maxima.hh> -#include <mln/level/convert.hh> -#include <mln/level/stretch.hh> +#include <mln/data/convert.hh> +#include <mln/data/stretch.hh> #include <mln/linear/gaussian.hh> #include <mln/morpho/rank_filter.hh> #include <mln/value/label_8.hh> @@ -28,8 +28,8 @@ // convert and stretch. int_u8 k = 1; - ima = level::convert(k, in); - ima = level::stretch(k, ima); + ima = data::convert(k, in); + ima = data::stretch(k, ima); } void Index: inim/2010/rag/rag.hh --- inim/2010/rag/rag.hh (revision 3923) +++ inim/2010/rag/rag.hh (working copy) @@ -18,7 +18,7 @@ # include <mln/morpho/closing/area.hh> # include <mln/morpho/opening/area.hh> # include <mln/morpho/elementary/gradient.hh> -# include <mln/level/transform.hh> +# include <mln/data/transform.hh> # include <mln/make/region_adjacency_graph.hh> # include <mln/util/graph.hh> Index: inim/2010/cag/superpose.hh --- inim/2010/cag/superpose.hh (revision 3923) +++ inim/2010/cag/superpose.hh (working copy) @@ -36,7 +36,7 @@ # include <mln/core/concept/image.hh> # include <mln/core/image/dmorph/image_if.hh> -# include <mln/level/convert.hh> +# include <mln/data/convert.hh> # include <mln/data/fill.hh> # include <mln/value/rgb8.hh> # include <mln/literal/colors.hh> @@ -95,7 +95,7 @@ mln_precondition(ws_ima.is_valid()); mln_ch_value(I,value::rgb8) output = - level::convert(value::rgb8(), input); + data::convert(value::rgb8(), input); data::fill((output | (pw::value(ws_ima) != pw::cst(mln_max(mln_value(J))))).rw(), Index: inim/2011/fredwin/inim.cc --- inim/2011/fredwin/inim.cc (revision 3923) +++ inim/2011/fredwin/inim.cc (working copy) @@ -13,7 +13,7 @@ /* Site set */ #include <mln/core/site_set/p_array.hh> -#include <mln/level/sort_psites.hh> +#include <mln/data/sort_psites.hh> /* Component trees */ #include <mln/morpho/tree/data.hh> @@ -42,7 +42,7 @@ #include <mln/pw/all.hh> /* labeling */ -#include <mln/level/stretch.hh> +#include <mln/data/stretch.hh> #include <mln/value/label_8.hh> #include <mln/labeling/blobs.hh> #include <mln/labeling/colorize.hh> @@ -50,7 +50,7 @@ /* Draw debug */ #include <mln/draw/box.hh> #include <mln/literal/colors.hh> -#include <mln/level/convert.hh> +#include <mln/data/convert.hh> /* std */ #include <string> @@ -168,7 +168,7 @@ typedef p_array< mln_site_(I) > S; typedef morpho::tree::data<I,S> tree_t; - S sorted_sites = level::sort_psites_decreasing(input); + S sorted_sites = data::sort_psites_decreasing(input); tree_t tree(input, sorted_sites, c4()); @@ -247,7 +247,7 @@ /* Now store output image image */ O out, distance; initialize(out, input); - distance = level::convert(value::rgb8 (), input); + distance = data::convert(value::rgb8 (), input); data::fill(out, literal::black_t()); data::paste(output | pw::value(input_), out); Index: inim/2009/classif/src/max_tree.hh --- inim/2009/classif/src/max_tree.hh (revision 3923) +++ inim/2009/classif/src/max_tree.hh (working copy) @@ -6,7 +6,7 @@ # include <mln/data/fill.hh> # include <mln/util/pix.hh> # include <mln/morpho/includes.hh> -# include <mln/level/sort_psites.hh> +# include <mln/data/sort_psites.hh> # include <mln/core/image/image2d.hh> # include <mln/core/image/image3d.hh> @@ -57,7 +57,7 @@ mln::data::fill(deja_vu, false); initialize(parent, f); initialize(zpar, f); - s = level::sort_psites_decreasing(f); + s = data::sort_psites_decreasing(f); } // first pass Index: inim/2009/classif/src/iccvg04.cc --- inim/2009/classif/src/iccvg04.cc (revision 3923) +++ inim/2009/classif/src/iccvg04.cc (working copy) @@ -31,7 +31,7 @@ #include <mln/literal/all.hh> -#include <mln/level/stretch.hh> +#include <mln/data/stretch.hh> #include <sys/stat.h> #include <sstream> Index: inim/2009/binarization/snake2d.cc --- inim/2009/binarization/snake2d.cc (revision 3923) +++ inim/2009/binarization/snake2d.cc (working copy) @@ -1,7 +1,7 @@ #include <mln/win/rectangle2d.hh> #include <mln/accu/maj_h.hh> #include <mln/value/int_u8.hh> -#include <mln/level/compare.hh> +#include <mln/data/compare.hh> #include <mln/make/image2d.hh> #include <mln/border/thickness.hh> #include "snake2d.hh" Index: inim/2009/color/min_tree_volume_filter.cc --- inim/2009/color/min_tree_volume_filter.cc (revision 3923) +++ inim/2009/color/min_tree_volume_filter.cc (working copy) @@ -29,7 +29,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/closing_area.hh> @@ -94,7 +94,7 @@ mln::data::fill(color, value::rgb8(255, 255, 255)); mln::data::fill(volume, 0); - s = level::sort_psites_increasing(f); + s = data::sort_psites_increasing(f); } // first pass Index: inim/2009/color/reference.cc --- inim/2009/color/reference.cc (revision 3923) +++ inim/2009/color/reference.cc (working copy) @@ -30,7 +30,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/convert/to.hh> @@ -517,7 +517,7 @@ image2d<value::rgb8> cells(ima.domain()); data::fill(cells, literal::white); - data::paste(level::transform(edge, colors), cells); + data::paste(data::transform(edge, colors), cells); io::ppm::save(display_edge_with_bg(cells, 3, literal::white), "tmp_edge.ppm"); // Move the color of an edge which is non black in the cell Index: inim/2009/color/min_tree_area_filter.cc --- inim/2009/color/min_tree_area_filter.cc (revision 3923) +++ inim/2009/color/min_tree_area_filter.cc (working copy) @@ -30,7 +30,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> @@ -45,7 +45,7 @@ # include <mln/core/concept/neighborhood.hh> # include <mln/util/pix.hh> # include <mln/morpho/includes.hh> -# include <mln/level/sort_psites.hh> +# include <mln/data/sort_psites.hh> #endif # include "src/distance.hh" @@ -104,7 +104,7 @@ //mln::data::fill(resp, false); mln::data::fill(area, 0); - s = level::sort_psites_increasing(f); + s = data::sort_psites_increasing(f); } // first pass Index: inim/2009/color/min_tree_height_filter.cc --- inim/2009/color/min_tree_height_filter.cc (revision 3923) +++ inim/2009/color/min_tree_height_filter.cc (working copy) @@ -29,7 +29,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/opt/at.hh> @@ -94,7 +94,7 @@ mln::data::fill(color, value::rgb8(255, 255, 255)); mln::data::fill(height, 0); - s = level::sort_psites_increasing(f); + s = data::sort_psites_increasing(f); } // first pass Index: inim/2009/color/min_tree_color.cc --- inim/2009/color/min_tree_color.cc (revision 3923) +++ inim/2009/color/min_tree_color.cc (working copy) @@ -30,7 +30,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/closing_area.hh> @@ -44,7 +44,7 @@ # include <mln/core/concept/neighborhood.hh> # include <mln/util/pix.hh> # include <mln/morpho/includes.hh> -# include <mln/level/sort_psites.hh> +# include <mln/data/sort_psites.hh> #endif # include "src/distance.hh" @@ -103,7 +103,7 @@ //mln::data::fill(resp, false); mln::data::fill(color, value::rgb8(0, 0, 0)); - s = level::sort_psites_increasing(f); + s = data::sort_psites_increasing(f); } // first pass Index: inim/2009/color/reference2.cc --- inim/2009/color/reference2.cc (revision 3923) +++ inim/2009/color/reference2.cc (working copy) @@ -30,7 +30,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> @@ -371,7 +371,7 @@ image2d<value::rgb8> cells(ima.domain()); data::fill(cells, literal::white); - data::paste(level::transform(edge, colors), cells); + data::paste(data::transform(edge, colors), cells); io::ppm::save(display_edge(cells, literal::white, 3), "tmp_edge.ppm"); // Move the color of an edge which is non black in the cell Index: inim/2009/color/min_tree_color_v2.cc --- inim/2009/color/min_tree_color_v2.cc (revision 3923) +++ inim/2009/color/min_tree_color_v2.cc (working copy) @@ -29,7 +29,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/closing_area.hh> @@ -92,7 +92,7 @@ mln::data::fill(deja_vu, false); mln::data::fill(color, value::rgb8(255, 255, 255)); - s = level::sort_psites_increasing(f); + s = data::sort_psites_increasing(f); } // first pass Index: inim/2009/nature/nature.cc --- inim/2009/nature/nature.cc (revision 3923) +++ inim/2009/nature/nature.cc (working copy) @@ -37,9 +37,9 @@ #include <mln/histo/compute.hh> -#include <mln/level/transform.hh> +#include <mln/data/transform.hh> #include <mln/data/paste.hh> -#include <mln/level/to_enc.hh> +#include <mln/data/to_enc.hh> #include <mln/value/rgb8.hh> #include <mln/value/hsi.hh> @@ -125,7 +125,7 @@ // First, we get the HSI histograms and corresponding greyscale versions of the picture - image2d<hsi_f> hsi = level::transform(input, fun::v2v::f_rgb_to_hsi_f); + image2d<hsi_f> hsi = data::transform(input, fun::v2v::f_rgb_to_hsi_f); thru<mln::meta::hue<hsi_f>, image2d<hsi_f> > hue(hsi); thru<mln::meta::sat<hsi_f>, image2d<hsi_f> > sat(hsi); @@ -164,7 +164,7 @@ dpoint2d d(0, 1); image2d<int_u8> uinty (qinty.domain()); { - image2d<unsigned char> tmp = level::transform(qinty, fun::v2v::enc< float01_8 >()); + image2d<unsigned char> tmp = data::transform(qinty, fun::v2v::enc< float01_8 >()); data::paste(tmp, uinty); /* mln_piter_(image2d<unsigned char>) p(tmp.domain()); for_all(p) Index: inim/2009/nature/hom.cc --- inim/2009/nature/hom.cc (revision 3923) +++ inim/2009/nature/hom.cc (working copy) @@ -39,7 +39,7 @@ # include <mln/core/alias/window2d.hh> -#include <mln/level/transform.hh> +#include <mln/data/transform.hh> #include <mln/binarization/threshold.hh> #include <mln/estim/mean.hh> #include <mln/morpho/hit_or_miss.hh> Index: inim/2009/nature/histo_hsi.cc --- inim/2009/nature/histo_hsi.cc (revision 3923) +++ inim/2009/nature/histo_hsi.cc (working copy) @@ -39,12 +39,12 @@ #include <mln/value/hsi.hh> #include <mln/fun/v2v/rgb_to_hsi.hh> -#include <mln/level/to_enc.hh> +#include <mln/data/to_enc.hh> #include <mln/fun/meta/hue.hh> #include <mln/fun/meta/sat.hh> #include <mln/fun/meta/inty.hh> -#include <mln/level/compare.hh> +#include <mln/data/compare.hh> #include <mln/io/ppm/load.hh> #include <mln/io/pbm/save.hh> @@ -52,7 +52,7 @@ #include <mln/accu/histo.hh> #include <mln/histo/compute.hh> -#include <mln/level/transform.hh> +#include <mln/data/transform.hh> #include <mln/data/fill.hh> using namespace mln; @@ -106,14 +106,14 @@ image2d<rgb8> input; io::ppm::load(input, argv[i]); - image2d<hsi_f> hsi = level::transform(input, fun::v2v::f_rgb_to_hsi_f); + image2d<hsi_f> hsi = data::transform(input, fun::v2v::f_rgb_to_hsi_f); thru<mln::meta::hue<hsi_f>, image2d<hsi_f> > h(hsi); cast_image_<float01_8, thru<mln::meta::hue<hsi_f>, image2d<hsi_f> > > hue(h); std::string n(argv[i]); n.erase(n.length() - 4); image2d<int_u8> henc; - level::transform(hue, fun::v2v::enc< float01_8 >(), henc); + data::transform(hue, fun::v2v::enc< float01_8 >(), henc); io::pgm::save(henc, n.append("_hue.pgm")); image2d<hsi_f>::piter p(hsi.domain()); @@ -138,7 +138,7 @@ n = argv[i]; n.erase(n.length() - 4); image2d<int_u8> senc; - level::transform(sat, fun::v2v::enc< float01_8 >(), senc); + data::transform(sat, fun::v2v::enc< float01_8 >(), senc); io::pgm::save(senc, n.append("_sat.pgm")); m = 0; @@ -160,7 +160,7 @@ n = argv[i]; n.erase(n.length() - 4); image2d<int_u8> ienc; - level::transform(inty, fun::v2v::enc< float01_8 >(), ienc); + data::transform(inty, fun::v2v::enc< float01_8 >(), ienc); io::pgm::save(ienc, n.append("_inty.pgm")); Index: theo/igr/irm_seg_with_mm_and_rag.cc --- theo/igr/irm_seg_with_mm_and_rag.cc (revision 3923) +++ theo/igr/irm_seg_with_mm_and_rag.cc (working copy) @@ -14,7 +14,7 @@ #include <mln/io/pgm/save.hh> #include <mln/value/int_u8.hh> -#include <mln/level/transform.hh> +#include <mln/data/transform.hh> #include <mln/convert/to_window.hh> #include <mln/convert/to_image.hh> @@ -25,7 +25,7 @@ #include <mln/morpho/meyer_wst.hh> #include <mln/accu/mean.hh> -#include <mln/level/take.hh> +#include <mln/data/take.hh> #include <mln/util/graph.hh> @@ -56,7 +56,7 @@ // if (lbl(p) == 82) // m.take(irm(p)); -// level::take(irm | (pw::value(lbl) == pw::cst(82)), m); +// data::take(irm | (pw::value(lbl) == pw::cst(82)), m); // std::cout << "reg 82 has mean = " << m << std::endl; } @@ -167,7 +167,7 @@ unsigned nbasins; image2d<unsigned> wshed = morpho::meyer_wst(clo, c4(), nbasins); std::cout << "nbasins = " << nbasins << std::endl; - io::pgm::save( level::transform(wshed, convert::to_fun(foo)), + io::pgm::save( data::transform(wshed, convert::to_fun(foo)), "tmp_wshed.pgm" ); // doit(irm, wshed, nbasins); Index: theo/igr/irm_anat_segm.cc --- theo/igr/irm_anat_segm.cc (revision 3923) +++ theo/igr/irm_anat_segm.cc (working copy) @@ -13,7 +13,7 @@ #include <mln/accu/mean.hh> #include <mln/labeling/compute.hh> #include <mln/fun/i2v/array.hh> -#include <mln/level/transform.hh> +#include <mln/data/transform.hh> @@ -61,7 +61,7 @@ fun::i2v::array<int_u8> f; convert::from_to(a, f); - image3d<int_u8> out = level::transform(wst, f); + image3d<int_u8> out = data::transform(wst, f); io::dump::save(out, argv[3]); Index: theo/igr/irm_anat_segm__2D_ONLY.cc --- theo/igr/irm_anat_segm__2D_ONLY.cc (revision 3923) +++ theo/igr/irm_anat_segm__2D_ONLY.cc (working copy) @@ -12,7 +12,7 @@ #include <mln/accu/mean.hh> #include <mln/labeling/compute.hh> #include <mln/fun/i2v/array.hh> -#include <mln/level/transform.hh> +#include <mln/data/transform.hh> @@ -51,7 +51,7 @@ fun::i2v::array<int_u8> f; convert::from_to(a, f); - image2d<int_u8> out = level::transform(wst, f); + image2d<int_u8> out = data::transform(wst, f); io::pgm::save(out, argv[2]); } Index: theo/igr/segment_2d_t.cc --- theo/igr/segment_2d_t.cc (revision 3923) +++ theo/igr/segment_2d_t.cc (working copy) @@ -14,7 +14,7 @@ #include <mln/value/int_u8.hh> #include <mln/value/int_u12.hh> #include <mln/value/label.hh> -#include <mln/level/transform.hh> +#include <mln/data/transform.hh> #include <mln/morpho/closing/height.hh> #include <mln/morpho/watershed/flooding.hh> @@ -92,7 +92,7 @@ std::cout << "min = " << min << " max = " << max << std::endl; } - mln_VAR(d, level::transform(df, int_u12_from_float())); + mln_VAR(d, data::transform(df, int_u12_from_float())); // debug_println("d", d); io_save_edges_int_u12(d, 0, "d.pgm"); @@ -119,7 +119,7 @@ if (m_[l] < 2) m_[l] == 2; // basin <=> 2..255 } - mln_VAR(d_m, level::transform(w, m_)); + mln_VAR(d_m, data::transform(w, m_)); mln_VAR(out, world::inter_pixel::display_edge(d_m.unmorph_(), 0, // background <=> 0 3)); Index: theo/igr/dump_to_dist.cc --- theo/igr/dump_to_dist.cc (revision 3923) +++ theo/igr/dump_to_dist.cc (working copy) @@ -14,7 +14,7 @@ #include <mln/io/pgm/save.hh> #include <mln/util/array.hh> -#include <mln/level/transform.hh> +#include <mln/data/transform.hh> #include <mln/data/paste.hh> #include <mln/morpho/elementary/closing.hh> @@ -152,7 +152,7 @@ io::dump::save(d_, argv[2]); -// mln_VAR(d_8, level::transform(d, int_u8_from_float())); +// mln_VAR(d_8, data::transform(d, int_u8_from_float())); // io::pgm::save(display_edge(d_8.unmorph_(), 0, 3), // argv[2]); Index: theo/rush/exo2/exo2.cc --- theo/rush/exo2/exo2.cc (revision 3923) +++ theo/rush/exo2/exo2.cc (working copy) @@ -10,7 +10,7 @@ #include <mln/io/pgm/load.hh> #include <mln/io/pbm/save.hh> -#include <mln/level/sort_psites.hh> +#include <mln/data/sort_psites.hh> #include <mln/morpho/tree/data.hh> #include <mln/morpho/tree/compute_attribute_image.hh> @@ -61,7 +61,7 @@ Accumulator<A> a_, double lambda1, double lambda2) - : sorted_sites_(level::sort_psites_decreasing(exact(f_))), + : sorted_sites_(data::sort_psites_decreasing(exact(f_))), tree_(exact(f_), sorted_sites_, c4()) { mln_VAR(a, morpho::tree::compute_attribute_image(a_, tree_)); Index: theo/rush/exo3/exo3_fun_generator.cc --- theo/rush/exo3/exo3_fun_generator.cc (revision 3923) +++ theo/rush/exo3/exo3_fun_generator.cc (working copy) @@ -10,7 +10,7 @@ #include <mln/fun/internal/resolve.hh> #include <mln/morpho/attribute/card.hh> #include <mln/morpho/attribute/sharpness.hh> -#include <mln/level/sort_offsets.hh> +#include <mln/data/sort_offsets.hh> #include <mln/canvas/morpho/attribute_filter.hh> #include <mln/canvas/morpho/internal/find_root.hh> @@ -353,7 +353,7 @@ l_minarea = atoi(argv[4]); mln_VAR(sharp, exo3_filter::attribute_filter(input, c4(), - level::sort_psites_decreasing(input), + data::sort_psites_decreasing(input), morpho::attribute::sharpness<I>(), l_sharpness)); mln_VAR(s, pw::value(sharp)); Index: theo/rush/exo3/exo3_fun_area.cc --- theo/rush/exo3/exo3_fun_area.cc (revision 3923) +++ theo/rush/exo3/exo3_fun_area.cc (working copy) @@ -10,7 +10,7 @@ #include <mln/fun/internal/resolve.hh> #include <mln/morpho/attribute/card.hh> #include <mln/morpho/attribute/sharpness.hh> -#include <mln/level/sort_offsets.hh> +#include <mln/data/sort_offsets.hh> #include <mln/canvas/morpho/attribute_filter.hh> #include <mln/canvas/morpho/internal/find_root.hh> @@ -303,7 +303,7 @@ l_maxarea = atoi(argv[4]); mln_VAR(sharp, exo3_filter::attribute_filter(input, c4(), - level::sort_psites_decreasing(input), + data::sort_psites_decreasing(input), morpho::attribute::sharpness<I>(), l_sharpness)); mln_VAR(s, pw::value(sharp)); Index: theo/exec/diff_abs.cc --- theo/exec/diff_abs.cc (revision 3923) +++ theo/exec/diff_abs.cc (working copy) @@ -1,7 +1,7 @@ #include "filetype.hh" #include <mln/fun/vv2v/diff_abs.hh> -#include <mln/level/transform.hh> +#include <mln/data/transform.hh> @@ -29,7 +29,7 @@ io::pgm::load(input1, argv[1]); io::pgm::load(input2, argv[2]); - io::pgm::save(level::transform(input1, + io::pgm::save(data::transform(input1, input2, fun::vv2v::diff_abs<int_u8>()), argv[3]); Index: theo/exec/gaussian_directional_2d__float.cc --- theo/exec/gaussian_directional_2d__float.cc (revision 3923) +++ theo/exec/gaussian_directional_2d__float.cc (working copy) @@ -10,7 +10,7 @@ #include <mln/pw/all.hh> #include <mln/data/fill.hh> -#include <mln/level/saturate.hh> +#include <mln/data/saturate.hh> @@ -66,7 +66,7 @@ out = linear::gaussian_directional_2d(temp, dir, sigma, bdr); - io::pgm::save(level::saturate(int_u8(), + io::pgm::save(data::saturate(int_u8(), (pw::value(out) * pw::cst(255.f)) | out.domain()), argv[5]); } @@ -86,7 +86,7 @@ out = linear::gaussian_directional_2d(temp, dir, sigma, bdr); - io::pgm::save(level::saturate(int_u8(), out), argv[5]); + io::pgm::save(data::saturate(int_u8(), out), argv[5]); } break; Index: theo/exec/watershed_flooding.cc --- theo/exec/watershed_flooding.cc (revision 3923) +++ theo/exec/watershed_flooding.cc (working copy) @@ -3,7 +3,7 @@ #include <mln/morpho/watershed/flooding.hh> #include <mln/value/label_16.hh> -#include <mln/level/transform.hh> +#include <mln/data/transform.hh> #include <mln/convert/to_fun.hh> @@ -57,7 +57,7 @@ } else if (get_filetype(argv[2]) == filetype::pgm) { - io::pgm::save( level::transform(wst, convert::to_fun(L_to_int_u8)), + io::pgm::save( data::transform(wst, convert::to_fun(L_to_int_u8)), argv[2] ); } else if (get_filetype(argv[2]) == filetype::pbm) Index: theo/exec/dump_12bit_to_pgm.cc --- theo/exec/dump_12bit_to_pgm.cc (revision 3923) +++ theo/exec/dump_12bit_to_pgm.cc (working copy) @@ -1,7 +1,7 @@ #include "filetype.hh" #include <mln/value/int_u12.hh> -#include <mln/level/stretch.hh> +#include <mln/data/stretch.hh> @@ -28,7 +28,7 @@ io::dump::load(vol, argv[1]); using value::int_u8; - image3d<int_u8> out = level::stretch(int_u8(), vol); + image3d<int_u8> out = data::stretch(int_u8(), vol); io::dump::save(out, argv[2]); trace::exiting("main"); Index: theo/exec/color_labeling_mean.cc --- theo/exec/color_labeling_mean.cc (revision 3923) +++ theo/exec/color_labeling_mean.cc (working copy) @@ -3,11 +3,11 @@ #include <mln/estim/min_max.hh> #include <mln/labeling/compute.hh> #include <mln/accu/mean.hh> -#include <mln/level/transform.hh> +#include <mln/data/transform.hh> #include <mln/value/label_8.hh> #include <mln/value/int_u16.hh> -#include <mln/level/convert.hh> +#include <mln/data/convert.hh> #include <mln/io/pgm/load.hh> #include <mln/io/ppm/load.hh> @@ -42,7 +42,7 @@ image2d<int_u8> lab; io::pgm::load(lab, argv[2]); - image2d<int_u16> lab_ = level::convert(int_u16(), lab); + image2d<int_u16> lab_ = data::convert(int_u16(), lab); int_u16 min, nlabels; estim::min_max(lab_, min, nlabels); @@ -63,5 +63,5 @@ c[l].blue() = m[l][2]; } - io::ppm::save(level::transform(lab, c), argv[3]); + io::ppm::save(data::transform(lab, c), argv[3]); } Index: theo/exec/gaussian_directional_2d.cc --- theo/exec/gaussian_directional_2d.cc (revision 3923) +++ theo/exec/gaussian_directional_2d.cc (working copy) @@ -10,7 +10,7 @@ #include <mln/pw/all.hh> #include <mln/data/fill.hh> -#include <mln/level/saturate.hh> +#include <mln/data/saturate.hh> @@ -66,7 +66,7 @@ out = linear::gaussian_directional_2d(temp, dir, sigma, bdr); - io::pgm::save(level::saturate(int_u8(), + io::pgm::save(data::saturate(int_u8(), (pw::value(out) * pw::cst(255.f)) | out.domain()), argv[5]); } @@ -86,7 +86,7 @@ out = linear::gaussian_directional_2d(temp, dir, sigma, bdr); - io::pgm::save(level::saturate(int_u8(), out), argv[5]); + io::pgm::save(data::saturate(int_u8(), out), argv[5]); } break; Index: theo/exec/distance_thick.cc --- theo/exec/distance_thick.cc (revision 3923) +++ theo/exec/distance_thick.cc (working copy) @@ -2,7 +2,7 @@ #include <mln/transform/distance_front.hh> #include <mln/make/w_window2d_int.hh> -#include <mln/level/stretch.hh> +#include <mln/data/stretch.hh> @@ -39,7 +39,7 @@ c4(), make::w_window2d_int(ws), mln_max(int_u12)); - io::pgm::save(level::stretch(int_u8(), dmap), + io::pgm::save(data::stretch(int_u8(), dmap), argv[2]); trace::exiting("main"); Index: theo/test_attribute.cc --- theo/test_attribute.cc (revision 3923) +++ theo/test_attribute.cc (working copy) @@ -32,8 +32,8 @@ #include <mln/core/image/image2d.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> -#include <mln/level/sort_psites.hh> -#include <mln/level/transform.hh> +#include <mln/data/sort_psites.hh> +#include <mln/data/transform.hh> #include <mln/debug/println.hh> #include <mln/core/var.hh> @@ -82,25 +82,25 @@ image2d<unsigned> area_inc, area_dec; { - S s = level::sort_psites_increasing(f); + S s = data::sort_psites_increasing(f); morpho::tree::data<I,S> t(f, s, c4()); accu::count<Px> a; area_inc = morpho::tree::compute_attribute_image(a, t); debug::println("area_inc =", area_inc); } { - S s = level::sort_psites_decreasing(f); + S s = data::sort_psites_decreasing(f); morpho::tree::data<I,S> t(f, s, c4()); accu::count<Px> a; area_dec = morpho::tree::compute_attribute_image(a, t); debug::println("area_dec =", area_dec); } - io::pgm::save(level::transform(area_inc, sat), "inc.pgm"); - io::pgm::save(level::transform(area_dec, sat), "dec.pgm"); + io::pgm::save(data::transform(area_inc, sat), "inc.pgm"); + io::pgm::save(data::transform(area_dec, sat), "dec.pgm"); image2d<unsigned> area = arith::min(area_inc, area_dec); - io::pgm::save(level::transform(area, sat), "min.pgm"); + io::pgm::save(data::transform(area, sat), "min.pgm"); unsigned lambda = 20; Index: theo/fllt.svg.6.cc --- theo/fllt.svg.6.cc (revision 3923) +++ theo/fllt.svg.6.cc (working copy) @@ -44,7 +44,7 @@ #include <mln/io/ppm/save.hh> #include <mln/data/fill.hh> -#include <mln/level/compare.hh> +#include <mln/data/compare.hh> #include <mln/debug/println.hh> #include <mln/labeling/regional_minima.hh> #include <mln/labeling/regional_maxima.hh> Index: theo/esiee/laurent/presentation/wst_edge.cc --- theo/esiee/laurent/presentation/wst_edge.cc (revision 3923) +++ theo/esiee/laurent/presentation/wst_edge.cc (working copy) @@ -29,7 +29,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> @@ -344,7 +344,7 @@ image2d<value::rgb8> temp(label.domain()); data::fill(temp, literal::white); - data::paste( level::transform(label | is_edge, + data::paste( data::transform(label | is_edge, colors), temp ); @@ -367,7 +367,7 @@ // // 1 1 1 - io::ppm::save(level::transform(cells2image(label), + io::ppm::save(data::transform(cells2image(label), colors), filename); } Index: theo/esiee/laurent/presentation/wst2d.cc --- theo/esiee/laurent/presentation/wst2d.cc (revision 3923) +++ theo/esiee/laurent/presentation/wst2d.cc (working copy) @@ -12,7 +12,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> @@ -113,7 +113,7 @@ // 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); } Index: theo/esiee/laurent/presentation/wst3d.cc --- theo/esiee/laurent/presentation/wst3d.cc (revision 3923) +++ theo/esiee/laurent/presentation/wst3d.cc (working copy) @@ -3,7 +3,7 @@ # include <mln/value/int_u16.hh> # include <mln/value/int_u8.hh> -# include <mln/level/stretch.hh> +# include <mln/data/stretch.hh> # include <mln/io/pgm/load.hh> # include <mln/io/ppm/save.hh> @@ -63,7 +63,7 @@ abort(); image3d<int_u8> ima(ima16.domain()); - level::stretch(ima16, ima); + data::stretch(ima16, ima); ima16.destroy(); int lambda = atoi(argv[2]); Index: theo/esiee/laurent/presentation/segmentation.hh --- theo/esiee/laurent/presentation/segmentation.hh (revision 3923) +++ theo/esiee/laurent/presentation/segmentation.hh (working copy) @@ -10,5 +10,5 @@ unsigned nbasins; mln_ch_value(I, unsigned) wst = morpho::wst_meyer(filtered, nbh, nbasins); - return level::transform(wst, colorize(nbasins)); + return data::transform(wst, colorize(nbasins)); } Index: theo/esiee/laurent/ismm09/trash.hh --- theo/esiee/laurent/ismm09/trash.hh (revision 3923) +++ theo/esiee/laurent/ismm09/trash.hh (working copy) @@ -13,7 +13,7 @@ mln_ch_value(F,L) regmins = labeling::regional_minima(f, nbh, n_basins); typedef p_array<mln_psite(F)> S; - S s = level::sort_psites_decreasing(f); + S s = data::sort_psites_decreasing(f); typedef morpho::tree::data<F,S> tree_t; tree_t t(f, s, nbh); Index: theo/esiee/laurent/ismm09/extinct_attributes.hh --- theo/esiee/laurent/ismm09/extinct_attributes.hh (revision 3923) +++ theo/esiee/laurent/ismm09/extinct_attributes.hh (working copy) @@ -122,7 +122,7 @@ node_only.t = &t; typedef p_array<P> S; - S s = level::sort_psites_increasing(f | node_only); + S s = data::sort_psites_increasing(f | node_only); if (echo) { Index: theo/esiee/laurent/ismm09/main.ext.cc --- theo/esiee/laurent/ismm09/main.ext.cc (revision 3923) +++ theo/esiee/laurent/ismm09/main.ext.cc (working copy) @@ -55,7 +55,7 @@ { typedef p_array<point2d> s_t; - s_t s = level::sort_psites_decreasing(g); // min-tree + s_t s = data::sort_psites_decreasing(g); // min-tree typedef morpho::tree::data<g_t,s_t> tree_t; tree_t t(g, s, cplx2d::e2e()); Index: theo/esiee/laurent/ismm09/main.cc --- theo/esiee/laurent/ismm09/main.cc (revision 3923) +++ theo/esiee/laurent/ismm09/main.cc (working copy) @@ -94,7 +94,7 @@ { typedef p_array<point2d> s_t; - s_t s = level::sort_psites_decreasing(g); // min-tree + s_t s = data::sort_psites_decreasing(g); // min-tree typedef morpho::tree::data<g_t,s_t> tree_t; tree_t t(g, s, cplx2d::e2e()); Index: theo/esiee/laurent/ismm09/util.hh --- theo/esiee/laurent/ismm09/util.hh (revision 3923) +++ theo/esiee/laurent/ismm09/util.hh (working copy) @@ -2,7 +2,7 @@ #include <mln/core/concept/function.hh> #include <mln/core/site_set/p_array.hh> -#include <mln/level/sort_psites.hh> +#include <mln/data/sort_psites.hh> #include <mln/morpho/tree/data.hh> #include <mln/morpho/tree/compute_attribute_image.hh> @@ -58,7 +58,7 @@ node_only.t = &t; typedef p_array<mln_site(A)> S; - S s = level::sort_psites_increasing(a | node_only); + S s = data::sort_psites_increasing(a | node_only); mln_fwd_piter(S) p(s); for_all(p) Index: theo/esiee/laurent/ismm09/pseudo_tree.hh --- theo/esiee/laurent/ismm09/pseudo_tree.hh (revision 3923) +++ theo/esiee/laurent/ismm09/pseudo_tree.hh (working copy) @@ -17,8 +17,8 @@ #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/save.hh> -#include <mln/level/stretch.hh> -#include <mln/level/compute.hh> +#include <mln/data/stretch.hh> +#include <mln/data/compute.hh> #include <mln/accu/max.hh> @@ -554,7 +554,7 @@ // Outputing. { - A aa_max = level::compute(accu::max<A>(), aa); + A aa_max = data::compute(accu::max<A>(), aa); using value::int_u8; if (aa_max < 256) { @@ -570,7 +570,7 @@ image2d<int_u8> output(aa_ext.domain()); data::fill(output, 0); data::paste(aa_ext, output); - io::pgm::save(level::stretch(int_u8(), output), + io::pgm::save(data::stretch(int_u8(), output), "aa_line.pgm"); } } Index: theo/cs2d/cs2d.cc --- theo/cs2d/cs2d.cc (revision 3923) +++ theo/cs2d/cs2d.cc (working copy) @@ -103,7 +103,7 @@ std::vector<int_u8> v(l + 1); accu::compute<accu::mean>(cs_.cell, label, v); - data::fill(cs_.cell, level::transform(label, v)); + data::fill(cs_.cell, data::transform(label, v)); io::pgm::save(cell_image(cs_), argv[3]); // io::ppm::save(pack(cs_, colorize, 7), "log.ppm"); Index: theo/cs2d/kruskal.cc --- theo/cs2d/kruskal.cc (revision 3923) +++ theo/cs2d/kruskal.cc (working copy) @@ -17,7 +17,7 @@ # include <mln/morpho/gradient.hh> # include <mln/morpho/meyer_wst.hh> -# include <mln/level/sort_points.hh> +# include <mln/data/sort_points.hh> # include <mln/io/pgm/load.hh> # include <mln/io/ppm/save.hh> @@ -280,7 +280,7 @@ typedef typeof(edge) edge_t; typedef p_array<point2d> Arr; - Arr E = level::sort_points_increasing(edge); + Arr E = data::sort_points_increasing(edge); // Aux data. mln_ch_value_(edge_t, bool) T; Index: theo/cs2d/cs2d_morpho.hh --- theo/cs2d/cs2d_morpho.hh (revision 3923) +++ theo/cs2d/cs2d_morpho.hh (working copy) @@ -345,14 +345,14 @@ } // mln::accu - namespace level + namespace data { template<typename I, typename R> mln_ch_value(I, R) transform(const Image<I>& input_, const std::vector<R>& v) { - trace::entering("level::transform"); + trace::entering("data::transform"); const I& input = exact(input_); mln_ch_value(I, R) output; @@ -362,11 +362,11 @@ for_all(p) output(p) = v[input(p)]; - trace::exiting("level::transform"); + trace::exiting("data::transform"); return output; } - } // mln::level + } // mln::data } // mln Index: theo/publis/icip2009/compute_a.cc --- theo/publis/icip2009/compute_a.cc (revision 3923) +++ theo/publis/icip2009/compute_a.cc (working copy) @@ -39,10 +39,10 @@ #include <mln/core/routine/duplicate.hh> #include <mln/core/site_set/p_array.hh> -#include <mln/level/sort_psites.hh> +#include <mln/data/sort_psites.hh> #include <mln/data/fill.hh> #include <mln/data/paste.hh> -#include <mln/level/compare.hh> +#include <mln/data/compare.hh> #include <mln/morpho/tree/data.hh> #include <mln/morpho/tree/compute_attribute_image.hh> @@ -131,7 +131,7 @@ { typedef mln_site(I) P; typedef p_array<P> S; - S s = level::sort_psites_increasing(f); + S s = data::sort_psites_increasing(f); // s maps increasing attributes. mln_ch_value(I, P) par; @@ -448,7 +448,7 @@ // NOW attributes are sorted increasingly! - S s_a = level::sort_psites_increasing(a); + S s_a = data::sort_psites_increasing(a); mln_fwd_piter(S) p(s_a); Index: theo/publis/icip2009/regmin_count.cc --- theo/publis/icip2009/regmin_count.cc (revision 3923) +++ theo/publis/icip2009/regmin_count.cc (working copy) @@ -33,7 +33,7 @@ #include <mln/debug/println.hh> #include <mln/core/site_set/p_array.hh> -#include <mln/level/sort_psites.hh> +#include <mln/data/sort_psites.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/labeling/regional_minima.hh> @@ -76,7 +76,7 @@ unsigned regmin_count(const I& f, const N& nbh) { typedef p_array<mln_psite(I)> S; - S s = level::sort_psites_increasing(f); + S s = data::sort_psites_increasing(f); // s maps increasing attributes. mln_ch_value(I, mln_site(I)) par; Index: theo/fllt/fllt.hh --- theo/fllt/fllt.hh (revision 3923) +++ theo/fllt/fllt.hh (working copy) @@ -47,8 +47,8 @@ #include <mln/data/fill.hh> #include <mln/data/paste.hh> -#include <mln/level/stretch.hh> -#include <mln/level/compare.hh> +#include <mln/data/stretch.hh> +#include <mln/data/compare.hh> #include <mln/debug/println.hh> #include <mln/labeling/regional_minima.hh> #include <mln/labeling/regional_maxima.hh> @@ -222,7 +222,7 @@ //save is image2d<value::int_u8> is_out(is.domain()); - level::stretch(cast_image<value::int_u8>(is), is_out); + data::stretch(cast_image<value::int_u8>(is), is_out); io::pgm::save(is_out, is_filename.str()); //io::pgm::save(out, filename.str()); } Index: theo/fllt/fllt.svg.7.hh --- theo/fllt/fllt.svg.7.hh (revision 3923) +++ theo/fllt/fllt.svg.7.hh (working copy) @@ -50,7 +50,7 @@ #include <mln/io/ppm/save.hh> #include <mln/data/fill.hh> -#include <mln/level/compare.hh> +#include <mln/data/compare.hh> #include <mln/debug/println.hh> #include <mln/labeling/regional_minima.hh> #include <mln/labeling/regional_maxima.hh> Index: theo/fllt/fllt.svg.4.cc --- theo/fllt/fllt.svg.4.cc (revision 3923) +++ theo/fllt/fllt.svg.4.cc (working copy) @@ -40,7 +40,7 @@ #include <mln/io/ppm/save.hh> #include <mln/data/fill.hh> -#include <mln/level/compare.hh> +#include <mln/data/compare.hh> #include <mln/debug/println.hh> #include <mln/labeling/regional_minima.hh> #include <mln/accu/bbox.hh> Index: theo/fllt/fllt.svg.5.cc --- theo/fllt/fllt.svg.5.cc (revision 3923) +++ theo/fllt/fllt.svg.5.cc (working copy) @@ -40,7 +40,7 @@ #include <mln/io/ppm/save.hh> #include <mln/data/fill.hh> -#include <mln/level/compare.hh> +#include <mln/data/compare.hh> #include <mln/debug/println.hh> #include <mln/labeling/regional_minima.hh> #include <mln/accu/bbox.hh> Index: theo/fllt/fllt.svg.6.cc --- theo/fllt/fllt.svg.6.cc (revision 3923) +++ theo/fllt/fllt.svg.6.cc (working copy) @@ -44,7 +44,7 @@ #include <mln/io/ppm/save.hh> #include <mln/data/fill.hh> -#include <mln/level/compare.hh> +#include <mln/data/compare.hh> #include <mln/debug/println.hh> #include <mln/labeling/regional_minima.hh> #include <mln/labeling/regional_maxima.hh> Index: theo/fllt/fllt_test.hh --- theo/fllt/fllt_test.hh (revision 3923) +++ theo/fllt/fllt_test.hh (working copy) @@ -46,7 +46,7 @@ #include <mln/io/ppm/save.hh> #include <mln/data/fill.hh> -#include <mln/level/compare.hh> +#include <mln/data/compare.hh> #include <mln/debug/println.hh> #include <mln/labeling/regional_minima.hh> #include <mln/labeling/regional_maxima.hh> Index: theo/fllt.svg.7.hh --- theo/fllt.svg.7.hh (revision 3923) +++ theo/fllt.svg.7.hh (working copy) @@ -48,7 +48,7 @@ #include <mln/io/ppm/save.hh> #include <mln/data/fill.hh> -#include <mln/level/compare.hh> +#include <mln/data/compare.hh> #include <mln/debug/println.hh> #include <mln/labeling/regional_minima.hh> #include <mln/labeling/regional_maxima.hh> Index: theo/dmap.cc --- theo/dmap.cc (revision 3923) +++ theo/dmap.cc (working copy) @@ -4,7 +4,7 @@ #include <mln/core/alias/w_window2d_int.hh> #include <mln/debug/println.hh> #include <mln/data/fill.hh> -#include <mln/level/stretch.hh> +#include <mln/data/stretch.hh> #include <mln/accu/max.hh> #include <mln/io/pbm/load.hh> #include <mln/io/pgm/save.hh> @@ -126,6 +126,6 @@ debug::println(d); // image2d<int_u8> out; -// level::stretch(d, out); +// data::stretch(d, out); // io::pgm::save(out, "out.pgm"); } Index: theo/Rd/diff.cc --- theo/Rd/diff.cc (revision 3923) +++ theo/Rd/diff.cc (working copy) @@ -1,6 +1,6 @@ #include <oln/core/2d/image2d.hh> #include <oln/io/load_pgm.hh> -#include <oln/level/compare.hh> +#include <oln/data/compare.hh> void usage(char* argv[]) Index: theo/Rd/utils.hh --- theo/Rd/utils.hh (revision 3923) +++ theo/Rd/utils.hh (working copy) @@ -37,7 +37,7 @@ # include <mln/data/fill_with_value.hh> # include <mln/data/paste.hh> -# include <mln/level/compare.hh> +# include <mln/data/compare.hh> Index: theo/Rd/diff_pgm.cc --- theo/Rd/diff_pgm.cc (revision 3923) +++ theo/Rd/diff_pgm.cc (working copy) @@ -1,7 +1,7 @@ #include <mln/core/image/image2d.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> -#include <mln/level/compare.hh> +#include <mln/data/compare.hh> #include <mln/value/int_u8.hh> Index: theo/tufa_2008/steps.0.cc --- theo/tufa_2008/steps.0.cc (revision 3923) +++ theo/tufa_2008/steps.0.cc (working copy) @@ -33,7 +33,7 @@ #include <mln/debug/println.hh> #include <mln/core/site_set/p_array.hh> -#include <mln/level/sort_psites.hh> +#include <mln/data/sort_psites.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/morpho/tree/data.hh> @@ -78,7 +78,7 @@ mln_concrete(I) filtering(const I& f, const A& a, const N& nbh, mln_value(A) lambda) { typedef p_array<mln_psite(I)> S; - S s = level::sort_psites_increasing(a); + S s = data::sort_psites_increasing(a); // s maps increasing attributes. @@ -148,7 +148,7 @@ debug::println("ref =", morpho::closing_area(f, c4(), 10)); typedef p_array<point2d> S; - S s = level::sort_psites_decreasing(f); + S s = data::sort_psites_decreasing(f); // Children go towards lower levels so leafs are regional minima. // We get a min-tree so that we can perform morphological closings. @@ -161,7 +161,7 @@ debug::println("g =", g); { - S s = level::sort_psites_decreasing(g); + S s = data::sort_psites_decreasing(g); morpho::tree::data<I,S> t(g, s, c4()); image2d<unsigned> a_g = morpho::tree::compute_attribute_image(attr, t); debug::println("a(f) =", a); Index: theo/tufa_2008/steps.1.cc --- theo/tufa_2008/steps.1.cc (revision 3923) +++ theo/tufa_2008/steps.1.cc (working copy) @@ -33,7 +33,7 @@ #include <mln/debug/println.hh> #include <mln/core/site_set/p_array.hh> -#include <mln/level/sort_psites.hh> +#include <mln/data/sort_psites.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/morpho/tree/data.hh> @@ -80,7 +80,7 @@ void run_run(const I& f, const A& a, const N& nbh) { typedef p_array<mln_psite(I)> S; - S s = level::sort_psites_increasing(a); + S s = data::sort_psites_increasing(a); // s maps increasing attributes. mln_ch_value(I, mln_site(I)) par; @@ -252,7 +252,7 @@ // debug::println("f =", f); typedef p_array<point2d> S; - S s = level::sort_psites_decreasing(f); + S s = data::sort_psites_decreasing(f); // Children go towards lower levels so leafs are regional minima. // We get a min-tree so that we can perform morphological closings. @@ -264,7 +264,7 @@ run_run(f, a, c4()); // { -// S s = level::sort_psites_decreasing(g); +// S s = data::sort_psites_decreasing(g); // morpho::tree::data<I,S> t(g, s, c4()); // image2d<unsigned> a_g = morpho::tree::compute_attribute_image(attr, t); // debug::println("a(f) =", a); Index: theo/tufa_2008/steps.2.cc --- theo/tufa_2008/steps.2.cc (revision 3923) +++ theo/tufa_2008/steps.2.cc (working copy) @@ -33,7 +33,7 @@ #include <mln/debug/println.hh> #include <mln/core/site_set/p_array.hh> -#include <mln/level/sort_psites.hh> +#include <mln/data/sort_psites.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/morpho/tree/data.hh> @@ -86,7 +86,7 @@ debug::println("f =", f); typedef p_array<mln_psite(I)> S; - S s = level::sort_psites_increasing(a); + S s = data::sort_psites_increasing(a); // s maps increasing attributes. mln_ch_value(I, mln_site(I)) par; @@ -227,7 +227,7 @@ usage(argv); typedef p_array<point2d> S; - S s = level::sort_psites_decreasing(f); + S s = data::sort_psites_decreasing(f); // Children go towards lower levels so leafs are regional minima. // We get a min-tree so that we can perform morphological closings. Index: theo/tufa_2008/steps.3.cc --- theo/tufa_2008/steps.3.cc (revision 3923) +++ theo/tufa_2008/steps.3.cc (working copy) @@ -33,7 +33,7 @@ #include <mln/debug/println.hh> #include <mln/core/site_set/p_array.hh> -#include <mln/level/sort_psites.hh> +#include <mln/data/sort_psites.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/morpho/tree/data.hh> @@ -81,7 +81,7 @@ void run_run(const I& f, const A& a, const N& nbh) { typedef p_array<mln_psite(I)> S; - S s = level::sort_psites_increasing(a); + S s = data::sort_psites_increasing(a); // s maps increasing attributes. mln_ch_value(I, mln_site(I)) par; @@ -172,7 +172,7 @@ io::pgm::load(f, argv[1]); typedef p_array<point2d> S; - S s = level::sort_psites_decreasing(f); + S s = data::sort_psites_decreasing(f); // Children go towards lower levels so leafs are regional minima. // We get a min-tree so that we can perform morphological closings. Index: theo/tufa_2008/steps.2b.cc --- theo/tufa_2008/steps.2b.cc (revision 3923) +++ theo/tufa_2008/steps.2b.cc (working copy) @@ -33,7 +33,7 @@ #include <mln/debug/println.hh> #include <mln/core/site_set/p_array.hh> -#include <mln/level/sort_psites.hh> +#include <mln/data/sort_psites.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/morpho/tree/data.hh> @@ -80,7 +80,7 @@ void run_run(const I& f, const A& a, const N& nbh) { typedef p_array<mln_psite(I)> S; - S s = level::sort_psites_increasing(a); + S s = data::sort_psites_increasing(a); // s maps increasing attributes. mln_ch_value(I, mln_site(I)) par; @@ -171,7 +171,7 @@ io::pgm::load(f, argv[1]); typedef p_array<point2d> S; - S s = level::sort_psites_decreasing(f); + S s = data::sort_psites_decreasing(f); // Children go towards lower levels so leafs are regional minima. // We get a min-tree so that we can perform morphological closings. Index: theo/tufa_2008/filter_n.cc --- theo/tufa_2008/filter_n.cc (revision 3923) +++ theo/tufa_2008/filter_n.cc (working copy) @@ -35,7 +35,7 @@ #include <mln/debug/println.hh> #include <mln/core/site_set/p_array.hh> -#include <mln/level/sort_psites.hh> +#include <mln/data/sort_psites.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/morpho/tree/data.hh> @@ -327,7 +327,7 @@ neighb2d nbh = c4(); typedef p_array<point2d> S; - S s = level::sort_psites_decreasing(f); + S s = data::sort_psites_decreasing(f); // Children go towards lower levels so leafs are regional minima. // We get a min-tree so that we can perform morphological closings. Index: theo/tufa_2008/wst_f_equal_wst_a.cc --- theo/tufa_2008/wst_f_equal_wst_a.cc (revision 3923) +++ theo/tufa_2008/wst_f_equal_wst_a.cc (working copy) @@ -37,8 +37,8 @@ #include <mln/literal/black.hh> #include <mln/core/site_set/p_array.hh> -#include <mln/level/sort_psites.hh> -#include <mln/level/transform.hh> +#include <mln/data/sort_psites.hh> +#include <mln/data/transform.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/morpho/tree/data.hh> @@ -106,14 +106,14 @@ image2d<unsigned> wst_f = morpho::meyer_wst(f, c4(), n); mln_assertion(n == nref); - io::ppm::save(level::transform(wst_f, colorize(n)), + io::ppm::save(data::transform(wst_f, colorize(n)), "wst_f.ppm"); mln_VAR(WST_f, (pw::value(wst_f) == pw::cst(0u)) | f.domain()); io::pbm::save(WST_f, "wst_f.pbm"); typedef p_array<point2d> S; - S s = level::sort_psites_decreasing(f); + S s = data::sort_psites_decreasing(f); // Children go towards lower levels so leafs are regional minima. // We get a min-tree so that we can perform morphological closings. @@ -129,7 +129,7 @@ image2d<unsigned> wst_a = morpho::meyer_wst(a, c4(), n); mln_assertion(n == nref); - io::ppm::save(level::transform(wst_a, colorize(n)), + io::ppm::save(data::transform(wst_a, colorize(n)), "wst_a.ppm"); mln_VAR(WST_a, (pw::value(wst_a) == pw::cst(0u)) | f.domain()); io::pbm::save(WST_a, "wst_a.pbm"); Index: theo/tufa_2008/wst.cc --- theo/tufa_2008/wst.cc (revision 3923) +++ theo/tufa_2008/wst.cc (working copy) @@ -36,7 +36,7 @@ #include <mln/value/int_u8.hh> #include <mln/data/fill.hh> -#include <mln/level/replace.hh> +#include <mln/data/replace.hh> #include <mln/morpho/meyer_wst.hh> #include <mln/io/pgm/load.hh> Index: theo/tufa_2008/experiment.cc --- theo/tufa_2008/experiment.cc (revision 3923) +++ theo/tufa_2008/experiment.cc (working copy) @@ -38,7 +38,7 @@ #include <mln/debug/println.hh> #include <mln/core/site_set/p_array.hh> -#include <mln/level/sort_psites.hh> +#include <mln/data/sort_psites.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/morpho/tree/data.hh> @@ -52,8 +52,8 @@ #include <mln/data/fill.hh> -#include <mln/level/transform.hh> -#include <mln/level/stretch.hh> +#include <mln/data/transform.hh> +#include <mln/data/stretch.hh> @@ -106,7 +106,7 @@ io::pgm::load(f, argv[1]); typedef p_array<point2d> S; - S s = level::sort_psites_decreasing(f); + S s = data::sort_psites_decreasing(f); // Children go towards lower levels so leafs are regional minima. // We get a min-tree so that we can perform morphological closings. @@ -115,12 +115,12 @@ accu::volume<I> attr; image2d<unsigned> a = morpho::tree::compute_attribute_image(attr, t); - io::pgm::save(level::stretch(int_u8(), a), + io::pgm::save(data::stretch(int_u8(), a), "a.pgm"); unsigned n; image2d<unsigned> wst_a = morpho::meyer_wst(a, c4(), n); - io::ppm::save(level::transform(wst_a, colorize(n)), + io::ppm::save(data::transform(wst_a, colorize(n)), "wst_a.ppm"); std::cout << "n(a) = " << n << std::endl; @@ -128,11 +128,11 @@ image2d<unsigned> aa = morpho::closing_area(a, c4(), 100); - io::pgm::save(level::stretch(int_u8(), aa), + io::pgm::save(data::stretch(int_u8(), aa), "aa.pgm"); image2d<unsigned> wst_aa = morpho::meyer_wst(aa, c4(), n); - io::ppm::save(level::transform(wst_aa, colorize(n)), + io::ppm::save(data::transform(wst_aa, colorize(n)), "wst_aa.ppm"); std::cout << "n(aa) = " << n << std::endl; } Index: theo/tufa_2008/n_cmpt.cc --- theo/tufa_2008/n_cmpt.cc (revision 3923) +++ theo/tufa_2008/n_cmpt.cc (working copy) @@ -69,10 +69,10 @@ typedef p_array<mln_psite(I)> S; typedef mln_ch_value(I, mln_result(A)) Attr; - S s = level::sort_psites_decreasing(f); + S s = data::sort_psites_decreasing(f); morpho::tree::data<I,S> t(f, s, nbh); Attr attr = morpho::tree::compute_attribute_image(a, t); - s = level::sort_psites_increasing(attr); + s = data::sort_psites_increasing(attr); debug::println("attr =", attr); Index: theo/tufa_2008/filter.cc --- theo/tufa_2008/filter.cc (revision 3923) +++ theo/tufa_2008/filter.cc (working copy) @@ -39,7 +39,7 @@ #include <mln/core/site_set/p_array.hh> #include <mln/core/alias/neighb2d.hh> -#include <mln/level/sort_psites.hh> +#include <mln/data/sort_psites.hh> #include <mln/data/fill.hh> #include <mln/morpho/tree/data.hh> @@ -66,7 +66,7 @@ mln_concrete(I) filtering(const I& f, const A& a, const N& nbh, mln_value(A) lambda) { typedef p_array<mln_psite(I)> S; - S s = level::sort_psites_increasing(a); + S s = data::sort_psites_increasing(a); // s maps increasing attributes. @@ -144,7 +144,7 @@ unsigned lambda = std::atoi(argv[2]); typedef p_array<point2d> S; - S s = level::sort_psites_decreasing(f); + S s = data::sort_psites_decreasing(f); // Children go towards lower levels so leafs are regional minima. // We get a min-tree so that we can perform morphological closings. Index: theo/tufa_2008/fz_count.cc --- theo/tufa_2008/fz_count.cc (revision 3923) +++ theo/tufa_2008/fz_count.cc (working copy) @@ -33,7 +33,7 @@ #include <mln/debug/println.hh> #include <mln/core/site_set/p_array.hh> -#include <mln/level/sort_psites.hh> +#include <mln/data/sort_psites.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/labeling/regional_minima.hh> @@ -75,7 +75,7 @@ unsigned fz_count(const I& f, const N& nbh) { typedef p_array<mln_psite(I)> S; - S s = level::sort_psites_increasing(f); + S s = data::sort_psites_increasing(f); // s maps increasing attributes. mln_ch_value(I, mln_site(I)) par; Index: theo/color/segment.hh --- theo/color/segment.hh (revision 3923) +++ theo/color/segment.hh (working copy) @@ -11,7 +11,7 @@ #include <mln/value/rgb8.hh> #include <mln/math/diff_abs.hh> -#include <mln/level/sort_psites.hh> +#include <mln/data/sort_psites.hh> #include <mln/labeling/regional_minima.hh> #include <mln/pw/all.hh> @@ -367,7 +367,7 @@ unsigned n_objects, unsigned less, bool echo = false) { - mln_concrete(I) g_ref = morpho::closing::leveling(f, nbh, A(), lambda); + mln_concrete(I) g_ref = morpho::closing::dataing(f, nbh, A(), lambda); unsigned n_regmins_g_ref; mln_ch_value(I, unsigned) regmin_g_ref = labeling::regional_minima(g_ref, nbh, n_regmins_g_ref); @@ -462,7 +462,7 @@ bool echo = false) { typedef p_array<mln_psite(F)> S; - S s = level::sort_psites_decreasing(f); + S s = data::sort_psites_decreasing(f); typedef morpho::tree::data<F,S> tree_t; tree_t t(f, s, nbh); @@ -527,7 +527,7 @@ gran_filter(const F& f, const N& nbh, const A& a_) { typedef p_array<mln_psite(F)> S; - S s = level::sort_psites_decreasing(f); + S s = data::sort_psites_decreasing(f); typedef morpho::tree::data<F,S> T; T t(f, s, nbh); Index: theo/color/segment_rgb_pixels.cc --- theo/color/segment_rgb_pixels.cc (revision 3923) +++ theo/color/segment_rgb_pixels.cc (working copy) @@ -12,7 +12,7 @@ #include <mln/io/ppm/save.hh> #include <mln/io/pgm/save.hh> #include <mln/io/pbm/save.hh> -#include <mln/level/convert.hh> +#include <mln/data/convert.hh> #include <mln/morpho/watershed/flooding.hh> #include <mln/morpho/attribute/card.hh> @@ -143,7 +143,7 @@ typedef p_array<mln_psite_(F)> S; - S s = level::sort_psites_decreasing(f); + S s = data::sort_psites_decreasing(f); typedef morpho::tree::data<F,S> tree_t; tree_t t(f, s, c4()); Index: theo/color/segment_rgb_edges.cc --- theo/color/segment_rgb_edges.cc (revision 3923) +++ theo/color/segment_rgb_edges.cc (working copy) @@ -350,7 +350,7 @@ util::array<rgb8> m; convert::from_to(m_3f, m); - io::ppm::save( level::transform(w_all, + io::ppm::save( data::transform(w_all, convert::to< fun::i2v::array<rgb8> >(m) ), argv[6] ); Index: theo/color/change_attributes.hh --- theo/color/change_attributes.hh (revision 3923) +++ theo/color/change_attributes.hh (working copy) @@ -174,7 +174,7 @@ node_only.t = &t; typedef p_array<P> S; - S s = level::sort_psites_increasing(a | node_only); + S s = data::sort_psites_increasing(a | node_only); mln_invariant(geom::nsites(a | t.nodes()) == s.nsites()); mln_fwd_piter(S) p(s); @@ -242,7 +242,7 @@ node_only.t = &t; typedef p_array<P> S; - S s = level::sort_psites_increasing(a | node_only); + S s = data::sort_psites_increasing(a | node_only); mln_invariant(geom::nsites(a | t.nodes()) == s.nsites()); mln_fwd_piter(S) p(s); Index: theo/color/filter_blen_rgb_edges.cc --- theo/color/filter_blen_rgb_edges.cc (revision 3923) +++ theo/color/filter_blen_rgb_edges.cc (working copy) @@ -279,7 +279,7 @@ typedef p_array<mln_psite_(I)> S; - S s = level::sort_psites_decreasing(f); + S s = data::sort_psites_decreasing(f); typedef morpho::tree::data<I,S> tree_t; tree_t t(f, s, e2e()); @@ -364,12 +364,12 @@ m[i] = rgb8(m_3f[i][0], m_3f[i][1], m_3f[i][2]); - io::ppm::save( level::transform(out_w, + io::ppm::save( data::transform(out_w, convert::to< fun::i2v::array<rgb8> >(m) ), argv[4] ); -// io::ppm::save( level::transform(w_all, +// io::ppm::save( data::transform(w_all, // convert::to< fun::i2v::array<rgb8> >(m) ), // argv[4] ); Index: theo/color/filter_meandist_rgb_pixels.cc --- theo/color/filter_meandist_rgb_pixels.cc (revision 3923) +++ theo/color/filter_meandist_rgb_pixels.cc (working copy) @@ -12,7 +12,7 @@ #include <mln/io/ppm/save.hh> #include <mln/io/pgm/save.hh> #include <mln/io/pbm/save.hh> -#include <mln/level/convert.hh> +#include <mln/data/convert.hh> #include <mln/morpho/watershed/flooding.hh> @@ -185,7 +185,7 @@ typedef p_array<mln_psite_(F)> S; - S s = level::sort_psites_decreasing(f); + S s = data::sort_psites_decreasing(f); typedef morpho::tree::data<F,S> tree_t; tree_t t(f, s, c4()); Index: theo/color/segment_gl_pixels.cc --- theo/color/segment_gl_pixels.cc (revision 3923) +++ theo/color/segment_gl_pixels.cc (working copy) @@ -12,7 +12,7 @@ #include <mln/io/ppm/save.hh> #include <mln/io/pgm/save.hh> -#include <mln/level/convert.hh> +#include <mln/data/convert.hh> #include <mln/morpho/elementary/gradient.hh> #include <mln/morpho/meyer_wst.hh> @@ -110,7 +110,7 @@ L nbasins; mln_ch_value_(I, L) w = morpho::meyer_wst(g, c4(), nbasins); - image2d<rgb8> output = level::convert(rgb8(), input); + image2d<rgb8> output = data::convert(rgb8(), input); data::fill((output | (pw::value(w) == 0)).rw(), literal::red); io::ppm::save(output, argv[6]); Index: theo/csi/edwin.cc --- theo/csi/edwin.cc (revision 3923) +++ theo/csi/edwin.cc (working copy) @@ -11,7 +11,7 @@ #include <mln/io/pgm/load.hh> #include <mln/io/pbm/save.hh> -#include <mln/level/sort_psites.hh> +#include <mln/data/sort_psites.hh> #include <mln/morpho/elementary/gradient.hh> #include <mln/morpho/tree/data.hh> @@ -121,7 +121,7 @@ typedef p_array<point2d> S; - S s = level::sort_psites_decreasing(f); + S s = data::sort_psites_decreasing(f); typedef morpho::tree::data<I,S> tree_t; tree_t t(f, s, nbh); Index: bugs/lut.cc --- bugs/lut.cc (revision 3923) +++ bugs/lut.cc (working copy) @@ -1,5 +1,5 @@ -/// Passing a fun::i2v::array to level::Transform can lead to a segfault. -/// Through the dispatch of level::transform, a dispatch function detects that +/// Passing a fun::i2v::array to data::Transform can lead to a segfault. +/// Through the dispatch of data::transform, a dispatch function detects that /// we are using int_u8 as values, meaning a low quantification value type. /// It tries to compute a look-up table (lut) which for each int_u8 value /// (0-255), maps a new value computed thanks to the function. @@ -7,7 +7,7 @@ #include <mln/core/image/image2d.hh> #include <mln/fun/i2v/array.hh> #include <mln/value/int_u8.hh> -#include <mln/level/transform.hh> +#include <mln/data/transform.hh> int main() { @@ -19,5 +19,5 @@ fun::i2v::array<bool> f(3, true); /// Crash, since the lut computes values for 0-255. - level::transform(ima, f); + data::transform(ima, f); } Index: lazzara/igr/irm_seg_with_mm_and_rag.mine.cc --- lazzara/igr/irm_seg_with_mm_and_rag.mine.cc (revision 3923) +++ lazzara/igr/irm_seg_with_mm_and_rag.mine.cc (working copy) @@ -24,7 +24,7 @@ #include <mln/value/int_u8.hh> #include <mln/value/label_16.hh> -#include <mln/level/transform.hh> +#include <mln/data/transform.hh> #include <mln/convert/to_window.hh> #include <mln/convert/to_image.hh> @@ -33,7 +33,7 @@ #include <mln/labeling/compute.hh> #include <mln/labeling/background.hh> -#include <mln/level/convert.hh> +#include <mln/data/convert.hh> #include <mln/make/image3d.hh> @@ -42,7 +42,7 @@ #include <mln/morpho/meyer_wst.hh> #include <mln/accu/mean.hh> -//#include <mln/level/take.hh> +//#include <mln/data/take.hh> #include <mln/util/graph.hh> @@ -262,7 +262,7 @@ label_16 nbasins; image2d<label_16> wshed = morpho::meyer_wst(clo, c4(), nbasins); std::cout << "nbasins = " << nbasins << std::endl; - io::pgm::save( level::transform(wshed, convert::to_fun(foo)), + io::pgm::save( data::transform(wshed, convert::to_fun(foo)), "tmp_wshed.pgm" ); mln_VAR(mean_values, labeling::compute(accu::meta::mean(), irm, wshed, nbasins)); @@ -272,11 +272,11 @@ if (f(mean_values[i])) to_keep(i) = i; - wshed = level::transform(wshed, to_keep); - io::pgm::save( level::transform(wshed, convert::to_fun(foo)), + wshed = data::transform(wshed, to_keep); + io::pgm::save( data::transform(wshed, convert::to_fun(foo)), "tmp_wshed_2.pgm" ); - image2d<bool> wshed_bw = level::transform(wshed, to_bool()); + image2d<bool> wshed_bw = data::transform(wshed, to_bool()); image2d<bool> main_obj = get_main_object_shape(wshed_bw); io::pbm::save(main_obj, "tmp_main_obj"); Index: lazzara/igr/igr-biggest-comp.cc --- lazzara/igr/igr-biggest-comp.cc (revision 3923) +++ lazzara/igr/igr-biggest-comp.cc (working copy) @@ -222,12 +222,12 @@ // Load ppm images and apply a threshold. // I in; // io::ppm::load(in, argv[1]); -// image2d<bool> in_bw = level::transform(in, threshold()); +// image2d<bool> in_bw = data::transform(in, threshold()); // J in_obj = get_main_object_shape(in_bw); // // I ref; // io::ppm::load(ref, argv[2]); -// image2d<bool> ref_bw = level::transform(ref, threshold()); +// image2d<bool> ref_bw = data::transform(ref, threshold()); // J ref_obj = get_main_object_shape(ref_bw); Index: lazzara/igr/irm/wst_rag_hsl.cc --- lazzara/igr/irm/wst_rag_hsl.cc (revision 3923) +++ lazzara/igr/irm/wst_rag_hsl.cc (working copy) @@ -20,7 +20,7 @@ #include <mln/labeling/mean_values.hh> -#include <mln/level/stretch.hh> +#include <mln/data/stretch.hh> #include <mln/morpho/elementary/dilation.hh> @@ -234,8 +234,8 @@ K input; io::ppm::load(input, argv[1]); - I input_ = level::convert(hsl_f(), input); - input = level::transform(input_, hsl2rgb()); + I input_ = data::convert(hsl_f(), input); + input = data::transform(input_, hsl2rgb()); J vol; io::dump::load(vol, argv[2]); @@ -287,7 +287,7 @@ std::cout << "nbasins2 = " << nbasins2 << std::endl; } // debug::println(vol); - vol2 = level::transform(vol, f); + vol2 = data::transform(vol, f); // debug::println(vol2); util::graph g2 = make::region_adjacency_graph(vol2, c4(), nbasins2); Index: lazzara/igr/irm/grad_clo_and_wshd.cc --- lazzara/igr/irm/grad_clo_and_wshd.cc (revision 3923) +++ lazzara/igr/irm/grad_clo_and_wshd.cc (working copy) @@ -15,7 +15,7 @@ #include <mln/value/int_u8.hh> #include <mln/value/label_16.hh> -#include <mln/level/transform.hh> +#include <mln/data/transform.hh> #include <mln/labeling/mean_values.hh> @@ -71,7 +71,7 @@ image2d<label_16> wshed = morpho::meyer_wst(clo, c4(), nbasins); std::cout << "nbasins = " << nbasins << std::endl; - io::pgm::save(level::transform(wshed, fun::v2v::wrap<int_u8>()), + io::pgm::save(data::transform(wshed, fun::v2v::wrap<int_u8>()), "tmp_wshed.pgm"); Index: lazzara/igr/irm/hsl_grad_and_wst.cc --- lazzara/igr/irm/hsl_grad_and_wst.cc (revision 3923) +++ lazzara/igr/irm/hsl_grad_and_wst.cc (working copy) @@ -58,11 +58,11 @@ I input_; io::ppm::load(input_, argv[1]); - J input = level::convert(hsl_f(), input_); - io::ppm::save(level::transform(input, hsl2rgb()), "input-hsl.ppm"); + J input = data::convert(hsl_f(), input_); + io::ppm::save(data::transform(input, hsl2rgb()), "input-hsl.ppm"); { - I tmp = level::transform(input, hsl2rgb()); + I tmp = data::transform(input, hsl2rgb()); image2d<int_u8> grad_hue; initialize(grad_hue, input); @@ -130,13 +130,13 @@ io::dump::save(wshed, "hsl2rgb_wshed.dump"); std::cout << "nbasins = " << nbasins << std::endl; - io::pgm::save(level::transform(wshed, fun::v2v::wrap<int_u8>()), + io::pgm::save(data::transform(wshed, fun::v2v::wrap<int_u8>()), "hsl2rgb_wshed.pgm"); - io::ppm::save(labeling::mean_values(level::transform(input, hsl2rgb()), wshed, nbasins), + io::ppm::save(labeling::mean_values(data::transform(input, hsl2rgb()), wshed, nbasins), "hsl2rgb_wshed_mean_colors.ppm"); - I out = level::transform(input, hsl2rgb()); + I out = data::transform(input, hsl2rgb()); io::ppm::save(out, "hsl2rgb_out.ppm"); } Index: lazzara/igr/irm/wst_rag.cc --- lazzara/igr/irm/wst_rag.cc (revision 3923) +++ lazzara/igr/irm/wst_rag.cc (working copy) @@ -11,7 +11,7 @@ #include <mln/accu/compute.hh> #include <mln/core/alias/dpoint2d.hh> #include <mln/draw/box.hh> -#include <mln/level/stretch.hh> +#include <mln/data/stretch.hh> #include <mln/fun/v2v/id.hh> #include <mln/core/image/line_graph_elt_neighborhood.hh> #include <mln/morpho/elementary/dilation.hh> @@ -92,7 +92,7 @@ convert::from_to(m_3f, m); m[0] = literal::yellow; - io::ppm::save(level::transform(w, + io::ppm::save(data::transform(w, convert::to< fun::i2v::array<mln_value(I)> >(m)), "wst_rag_wshd_color.ppm"); @@ -273,7 +273,7 @@ mln_invariant(f(0) == 0u); --nbasins2; //nbasins2 does not count the basin with label 0. std::cout << "nbasins2 = " << nbasins2 << std::endl; - J wsd2 = level::transform(wsd, f); + J wsd2 = data::transform(wsd, f); /// Reconstruct a graph from the simplified image. Index: edwin/tree/tree.cc --- edwin/tree/tree.cc (revision 3923) +++ edwin/tree/tree.cc (working copy) @@ -11,7 +11,7 @@ #include <mln/io/pgm/load.hh> #include <mln/io/pbm/save.hh> -#include <mln/level/sort_psites.hh> +#include <mln/data/sort_psites.hh> #include <mln/morpho/tree/data.hh> #include <mln/morpho/tree/compute_attribute_image.hh> @@ -72,7 +72,7 @@ Accumulator<A> a_, double lambda1, double lambda2) - : sorted_sites_(level::sort_psites_decreasing(exact(f_))), + : sorted_sites_(data::sort_psites_decreasing(exact(f_))), tree_(exact(f_), sorted_sites_, c4()) { mln_VAR(a, morpho::tree::compute_attribute_image(a_, tree_)); @@ -109,14 +109,14 @@ //debug::println(img | tree.nodes()); - N nodes = level::sort_psites_increasing(img); + N nodes = data::sort_psites_increasing(img); mln_fwd_piter(N) n(nodes); mln_fwd_piter(PS) p(pset), p_rm(ps_rm); old = 0; // FIXME: hack because we want iterate on nodes and we would // have wanted to write: - // N nodes = level::sort_psites_increasing(img | tree.nodes) + // N nodes = data::sort_psites_increasing(img | tree.nodes) // // but it doesn't work, so we iterate on domain regarding if n is // a node. Index: edwin/tree/propagation.cc --- edwin/tree/propagation.cc (revision 3923) +++ edwin/tree/propagation.cc (working copy) @@ -15,7 +15,7 @@ #include <mln/io/pgm/load.hh> -#include <mln/level/sort_psites.hh> +#include <mln/data/sort_psites.hh> #include <mln/morpho/tree/data.hh> #include <../../theo/color/change_attributes.hh> @@ -58,7 +58,7 @@ typedef p_array< mln_site_(I) > S; typedef morpho::tree::data<I,S> tree_t; - S sorted_sites = level::sort_psites_decreasing(input); + S sorted_sites = data::sort_psites_decreasing(input); tree_t tree(input, sorted_sites, c4()); dsp("Input:"); Index: edwin/rush/leaves/test/export.cc --- edwin/rush/leaves/test/export.cc (revision 3923) +++ edwin/rush/leaves/test/export.cc (working copy) @@ -30,7 +30,7 @@ #include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> -#include <mln/level/sort_psites.hh> +#include <mln/data/sort_psites.hh> #include <mln/morpho/tree/data.hh> #include "../export_leaves.hh" @@ -51,7 +51,7 @@ 4, 4, 4 }; I ima = make::image2d(vals); - S s = level::sort_psites_decreasing(ima); + S s = data::sort_psites_decreasing(ima); tree_t t(ima, s, c4()); export_leaves_to_file(t, ima); Index: edwin/rush/leaves/get_leaves.cc --- edwin/rush/leaves/get_leaves.cc (revision 3923) +++ edwin/rush/leaves/get_leaves.cc (working copy) @@ -2,7 +2,7 @@ #include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> -#include <mln/level/sort_psites.hh> +#include <mln/data/sort_psites.hh> #include <mln/morpho/tree/data.hh> #include <mln/morpho/tree/compute_attribute_image.hh> @@ -47,7 +47,7 @@ // Tree Creation typedef p_array<point2d> S; typedef morpho::tree::data<I,S> tree_t; - S s = level::sort_psites_decreasing(input); + S s = data::sort_psites_decreasing(input); tree_t t(input, s, c4()); // Attribute pruning. Index: edwin/rush/granulometry/test.cc --- edwin/rush/granulometry/test.cc (revision 3923) +++ edwin/rush/granulometry/test.cc (working copy) @@ -34,7 +34,7 @@ #include <mln/io/pgm/load.hh> -#include <mln/level/sort_psites.hh> +#include <mln/data/sort_psites.hh> #include <mln/morpho/tree/data.hh> #include <mln/morpho/tree/compute_attribute_image.hh> #include <mln/morpho/attribute/card.hh> @@ -66,7 +66,7 @@ typedef p_array<point2d> S; typedef morpho::tree::data<I,S> tree_t; - S s = level::sort_psites_decreasing(input); + S s = data::sort_psites_decreasing(input); tree_t tree(input, s, c4()); typedef mln_ch_value_(I, unsigned) A; Index: edwin/rush/exo2/wst_from_closing.cc --- edwin/rush/exo2/wst_from_closing.cc (revision 3923) +++ edwin/rush/exo2/wst_from_closing.cc (working copy) @@ -33,7 +33,7 @@ #include <mln/value/int_u16.hh> #include <mln/value/rgb8.hh> #include <mln/value/label_16.hh> -#include <mln/level/convert.hh> +#include <mln/data/convert.hh> #include <mln/io/ppm/load.hh> #include <mln/io/ppm/save.hh> @@ -118,7 +118,7 @@ if (!output_ || output_ == 3) { typedef image2d<value::label_16> L; - L lab = level::convert(value::label_16(), + L lab = data::convert(value::label_16(), morpho::elementary::dilation(wst, c8())); I_ out = color_labeling_mean(input_, lab, n_basins); io::ppm::save(out, "mean.pgm"); Index: edwin/rush/exo2/test.cc --- edwin/rush/exo2/test.cc (revision 3923) +++ edwin/rush/exo2/test.cc (working copy) @@ -4,7 +4,7 @@ #include <mln/morpho/tree/data.hh> #include <mln/morpho/tree/compute_attribute_image.hh> -#include <mln/level/sort_psites.hh> +#include <mln/data/sort_psites.hh> #include <mln/debug/println.hh> #include <mln/convert/all.hh> @@ -76,7 +76,7 @@ typedef p_array<point1d> S; typedef morpho::tree::data<I,S> tree_t; - S s = level::sort_psites_decreasing(input); + S s = data::sort_psites_decreasing(input); tree_t t(input, s, c2()); Index: edwin/rush/exo2/wst_from_tree.cc --- edwin/rush/exo2/wst_from_tree.cc (revision 3923) +++ edwin/rush/exo2/wst_from_tree.cc (working copy) @@ -43,7 +43,7 @@ #include "color_internal_gradient.hh" /* Labeling */ -#include <mln/level/convert.hh> +#include <mln/data/convert.hh> #include "color_labeling_mean.hh" /* WST */ @@ -52,7 +52,7 @@ #include <mln/morpho/elementary/dilation.hh> /* Tree computation */ -#include <mln/level/sort_psites.hh> +#include <mln/data/sort_psites.hh> #include <mln/morpho/tree/data.hh> #include <mln/morpho/tree/propagate.hh> #include <mln/morpho/tree/propagate_if.hh> @@ -70,7 +70,7 @@ #include <iostream> #include <string> -#include <mln/level/stretch.hh> +#include <mln/data/stretch.hh> #include <mln/io/pgm/save.hh> namespace mln @@ -188,7 +188,7 @@ typedef p_array<point2d> S; typedef morpho::tree::data<I,S> tree_t; - S s = level::sort_psites_decreasing(input); + S s = data::sort_psites_decreasing(input); tree_t t(input, s, c4()); @@ -218,7 +218,7 @@ /************************************************/ p_array< mln_psite_(A) > obj_array; { - //I output = level::stretch(int_u8(), a); //adapt to 0-255 + //I output = data::stretch(int_u8(), a); //adapt to 0-255 //io::pgm::save(output, "components.pgm"); obj_array = morpho::tree::get_components(t, a); @@ -258,7 +258,7 @@ if (!output_ || output_ == 3) { typedef image2d<value::label_16> L; - L lab = level::convert(value::label_16(), + L lab = data::convert(value::label_16(), morpho::elementary::dilation(wst, c8())); I_ out = color_labeling_mean(input_, lab, n_basins); io::ppm::save(out, "mean.pgm"); Index: edwin/rush/exo2/color_labeling_mean.hh --- edwin/rush/exo2/color_labeling_mean.hh (revision 3923) +++ edwin/rush/exo2/color_labeling_mean.hh (working copy) @@ -33,7 +33,7 @@ # include <mln/labeling/compute.hh> # include <mln/accu/mean.hh> -# include <mln/level/transform.hh> +# include <mln/data/transform.hh> # include <mln/value/label_8.hh> # include <mln/value/int_u16.hh> @@ -62,7 +62,7 @@ c[l].blue() = m[l][2]; } - return level::transform(label, c); + return data::transform(label, c); } } // mln Index: edwin/tests/sharp.cc --- edwin/tests/sharp.cc (revision 3923) +++ edwin/tests/sharp.cc (working copy) @@ -7,7 +7,7 @@ /* Site set */ #include <mln/core/site_set/p_array.hh> -#include <mln/level/sort_psites.hh> +#include <mln/data/sort_psites.hh> /* Component trees */ #include <mln/morpho/tree/data.hh> @@ -32,7 +32,7 @@ #include <mln/pw/all.hh> /* level */ -//#include <mln/level/stretch.hh> +//#include <mln/data/stretch.hh> /* label */ #include <mln/labeling/blobs.hh> @@ -209,7 +209,7 @@ typedef p_array< mln_site_(I) > S; typedef morpho::tree::data<I,S> tree_t; - S sorted_sites = level::sort_psites_decreasing(input); + S sorted_sites = data::sort_psites_decreasing(input); tree_t tree(input, sorted_sites, c4()); @@ -276,7 +276,7 @@ // Note: now we must propagate the representant value to the other components sites. //a = morpho::tree::propagate_components(a, tree, obj_array, 0); - //I output = level::stretch(int_u8(), a); //adapt to 0-255 + //I output = data::stretch(int_u8(), a); //adapt to 0-255 //io::pgm::save(output, "components.pgm"); Index: camille/graph-wst.cc --- camille/graph-wst.cc (revision 3923) +++ camille/graph-wst.cc (working copy) @@ -60,7 +60,7 @@ #include <mln/morpho/line_gradient.hh> #include <mln/morpho/closing_area_on_vertices.hh> #include <mln/morpho/meyer_wst.hh> -#include <mln/level/stretch.hh> +#include <mln/data/stretch.hh> #include <mln/value/int_u8.hh> #include <mln/value/int_u16.hh> Index: camille/graph-line-gradient-closing.cc --- camille/graph-line-gradient-closing.cc (revision 3923) +++ camille/graph-line-gradient-closing.cc (working copy) @@ -60,7 +60,7 @@ #include <mln/morpho/line_gradient.hh> #include <mln/morpho/closing_area_on_vertices.hh> #include <mln/morpho/meyer_wst.hh> -#include <mln/level/stretch.hh> +#include <mln/data/stretch.hh> #include <mln/value/int_u8.hh> #include <mln/value/int_u16.hh> Index: vigouroux/convert/stretch.hh --- vigouroux/convert/stretch.hh (revision 3923) +++ vigouroux/convert/stretch.hh (working copy) @@ -134,7 +134,7 @@ ** \code ** #include <oln/basics2d.hh> ** #include <oln/convert/stretch.hh> - ** #include <oln/level/cc.hh> + ** #include <oln/data/cc.hh> ** #include <ntg/all.hh> ** #include <iostream> ** @@ -145,7 +145,7 @@ ** //Extraction of the connected components: ** unsigned card; ** oln::image2d<ntg::int_u8> cc - ** = oln::level::frontp_connected_component<ntg::int_u8>(light, + ** = oln::data::frontp_connected_component<ntg::int_u8>(light, ** oln::neighb_c8(), ** card); ** oln::io::save(cc, IMG_OUT "oln_convert_stretch_dark.pgm"); Index: vigouroux/yuv/test.cc --- vigouroux/yuv/test.cc (revision 3923) +++ vigouroux/yuv/test.cc (working copy) @@ -9,7 +9,7 @@ #include <mln/io/ppm/load.hh> #include <mln/io/ppm/save.hh> #include <mln/math/round.hh> -#include <mln/level/transform.hh> +#include <mln/data/transform.hh> int main() { @@ -19,10 +19,10 @@ io::ppm::load(lena, "../../../img/lena.ppm"); image2d< value::yuv_<float, float, float> > lena_hsi - = level::transform(lena, + = data::transform(lena, fun::v2v::f_rgb_to_yuv_f()); - image2d<value::rgb8> lena_rgb = level::transform(lena_hsi, + image2d<value::rgb8> lena_rgb = data::transform(lena_hsi, fun::v2v::f_yuv_to_rgb_3x8); } Index: vigouroux/yuv/testfun.cc --- vigouroux/yuv/testfun.cc (revision 3923) +++ vigouroux/yuv/testfun.cc (working copy) @@ -9,7 +9,7 @@ #include <mln/io/ppm/load.hh> #include <mln/io/ppm/save.hh> #include <mln/math/round.hh> -#include <mln/level/transform.hh> +#include <mln/data/transform.hh> #include "fun.hh" @@ -22,9 +22,9 @@ mln::image2d<mln::value::rgb8> lena; mln::io::ppm::load(lena, "../../../img/lena.ppm"); - mln::image2d<mln::value::yuv_d> lena_yuv = mln::level::transform(lena, + mln::image2d<mln::value::yuv_d> lena_yuv = mln::data::transform(lena, mln::fun::v2v::f_rgb_to_yuv_d()); - mln::image2d<mln::value::rgb8> lena_rgb = mln::level::transform(lena_yuv, + mln::image2d<mln::value::rgb8> lena_rgb = mln::data::transform(lena_yuv, f_yuv_3x8); } Index: vigouroux/cmy/test.cc --- vigouroux/cmy/test.cc (revision 3923) +++ vigouroux/cmy/test.cc (working copy) @@ -9,7 +9,7 @@ #include <mln/io/ppm/load.hh> #include <mln/io/ppm/save.hh> #include <mln/math/round.hh> -#include <mln/level/transform.hh> +#include <mln/data/transform.hh> int main() { @@ -19,10 +19,10 @@ io::ppm::load(lena, "../../../img/lena.ppm"); image2d< value::cmy_<float, float, float> > lena_hsi - = level::transform(lena, + = data::transform(lena, fun::v2v::f_rgb_to_cmy_f()); - image2d<value::rgb8> lena_rgb = level::transform(lena_hsi, + image2d<value::rgb8> lena_rgb = data::transform(lena_hsi, fun::v2v::f_cmy_to_rgb_3x8); } Index: vigouroux/cmy/testfun.cc --- vigouroux/cmy/testfun.cc (revision 3923) +++ vigouroux/cmy/testfun.cc (working copy) @@ -9,7 +9,7 @@ #include <mln/io/ppm/load.hh> #include <mln/io/ppm/save.hh> #include <mln/math/round.hh> -#include <mln/level/transform.hh> +#include <mln/data/transform.hh> #include "fun.hh" @@ -22,9 +22,9 @@ mln::image2d<mln::value::rgb8> lena; mln::io::ppm::load(lena, "../../../img/lena.ppm"); - mln::image2d<mln::value::cmy_d> lena_cmy = mln::level::transform(lena, + mln::image2d<mln::value::cmy_d> lena_cmy = mln::data::transform(lena, mln::fun::v2v::f_rgb_to_cmy_d()); - mln::image2d<mln::value::rgb8> lena_rgb = mln::level::transform(lena_cmy, + mln::image2d<mln::value::rgb8> lena_rgb = mln::data::transform(lena_cmy, f_cmy_3x8); } Index: vigouroux/xyz/test.cc --- vigouroux/xyz/test.cc (revision 3923) +++ vigouroux/xyz/test.cc (working copy) @@ -9,7 +9,7 @@ #include <mln/io/ppm/load.hh> #include <mln/io/ppm/save.hh> #include <mln/math/round.hh> -#include <mln/level/transform.hh> +#include <mln/data/transform.hh> int main() { @@ -19,10 +19,10 @@ io::ppm::load(lena, "../../../img/lena.ppm"); image2d< value::xyz_<float, float, float> > lena_hsi - = level::transform(lena, + = data::transform(lena, fun::v2v::f_rgb_to_xyz_f_t()); -// image2d<value::rgb8> lena_rgb = level::transform(lena_hsi, +// image2d<value::rgb8> lena_rgb = data::transform(lena_hsi, // fun::v2v::f_xyz_to_rgb_3x8); } Index: vigouroux/xyz/testfun.cc --- vigouroux/xyz/testfun.cc (revision 3923) +++ vigouroux/xyz/testfun.cc (working copy) @@ -9,7 +9,7 @@ #include <mln/io/ppm/load.hh> #include <mln/io/ppm/save.hh> #include <mln/math/round.hh> -#include <mln/level/transform.hh> +#include <mln/data/transform.hh> #include "rgb_to_xyz.hh" #include "get_red.hh" @@ -23,9 +23,9 @@ mln::image2d<mln::value::rgb8> lena; mln::io::ppm::load(lena, "../../../img/lena.ppm"); - mln::image2d<mln::value::xyz_f> lena_xyz = mln::level::transform(lena, + mln::image2d<mln::value::xyz_f> lena_xyz = mln::data::transform(lena, mln::fun::v2v::f_rgb_to_xyz_f_t()); - mln::image2d<mln::value::rgb8> lena_rgb = mln::level::transform(lena_xyz, + mln::image2d<mln::value::rgb8> lena_rgb = mln::data::transform(lena_xyz, f_xyz_get_red ()); } Index: vigouroux/moyenne.cc --- vigouroux/moyenne.cc (revision 3923) +++ vigouroux/moyenne.cc (working copy) @@ -9,7 +9,7 @@ #include <mln/io/ppm/load.hh> #include <mln/io/ppm/save.hh> #include <mln/math/round.hh> -#include <mln/level/transform.hh> +#include <mln/data/transform.hh> @@ -51,10 +51,10 @@ image2d<value::rgb8> lena; io::ppm::load(lena, "../../img/lena.ppm"); - image2d<value::hsi_f> lena_hsi = level::transform(lena, + image2d<value::hsi_f> lena_hsi = data::transform(lena, fun::v2v::f_rgb_to_hsi_f); - image2d<value::rgb8> lena_rgb = level::transform(lena_hsi, + image2d<value::rgb8> lena_rgb = data::transform(lena_hsi, fun::v2v::f_hsi_to_rgb_3x8); double err = rms(lena, lena_rgb); Index: vigouroux/lap.cc --- vigouroux/lap.cc (revision 3923) +++ vigouroux/lap.cc (working copy) @@ -16,7 +16,7 @@ #include <mln/value/hsi.hh> #include <mln/fun/v2v/rgb_to_hsi.hh> -#include <mln/level/transform.hh> +#include <mln/data/transform.hh> #include <iostream> @@ -39,7 +39,7 @@ image2d<value::hsi_f> reshsi(tmp.domain()); gradation2(tmp, reshsi); - image2d<value::rgb8> resrgb = level::transform(reshsi, + image2d<value::rgb8> resrgb = data::transform(reshsi, fun::v2v::f_hsi_to_rgb_3x8); Index: vigouroux/yiq/test.cc --- vigouroux/yiq/test.cc (revision 3923) +++ vigouroux/yiq/test.cc (working copy) @@ -9,7 +9,7 @@ #include <mln/io/ppm/load.hh> #include <mln/io/ppm/save.hh> #include <mln/math/round.hh> -#include <mln/level/transform.hh> +#include <mln/data/transform.hh> int main() { @@ -19,10 +19,10 @@ io::ppm::load(lena, "../../../img/lena.ppm"); image2d< value::yiq_<double, double, double> > lena_hsi - = level::transform(lena, + = data::transform(lena, fun::v2v::f_rgb_to_yiq_d()); - image2d<value::rgb8> lena_rgb = level::transform(lena_hsi, + image2d<value::rgb8> lena_rgb = data::transform(lena_hsi, fun::v2v::f_yiq_to_rgb_3x8); } Index: vigouroux/yiq/testfun.cc --- vigouroux/yiq/testfun.cc (revision 3923) +++ vigouroux/yiq/testfun.cc (working copy) @@ -9,7 +9,7 @@ #include <mln/io/ppm/load.hh> #include <mln/io/ppm/save.hh> #include <mln/math/round.hh> -#include <mln/level/transform.hh> +#include <mln/data/transform.hh> #include "get_red.hh" @@ -22,9 +22,9 @@ mln::image2d<mln::value::rgb8> lena; mln::io::ppm::load(lena, "../../../img/lena.ppm"); - mln::image2d<mln::value::yiq_d> lena_yiq = mln::level::transform(lena, + mln::image2d<mln::value::yiq_d> lena_yiq = mln::data::transform(lena, mln::fun::v2v::f_rgb_to_yiq_d()); - mln::image2d<mln::value::rgb8> lena_rgb = mln::level::transform(lena_yiq, + mln::image2d<mln::value::rgb8> lena_rgb = mln::data::transform(lena_yiq, f_yiq_3x8); } Index: vigouroux/load.cc --- vigouroux/load.cc (revision 3923) +++ vigouroux/load.cc (working copy) @@ -9,7 +9,7 @@ #include <mln/io/ppm/load.hh> #include <mln/io/ppm/save.hh> #include <mln/math/round.hh> -#include <mln/level/transform.hh> +#include <mln/data/transform.hh> #include <mln/core/alias/w_window2d_float.hh> #include <mln/border/thickness.hh> Index: vigouroux/conv/test.cc --- vigouroux/conv/test.cc (revision 3923) +++ vigouroux/conv/test.cc (working copy) @@ -10,7 +10,7 @@ #include <mln/io/ppm/load.hh> #include <mln/io/ppm/save.hh> #include <mln/math/round.hh> -#include <mln/level/transform.hh> +#include <mln/data/transform.hh> int main(void) @@ -25,9 +25,9 @@ io::ppm::load(lena, "../../../img/lena.ppm"); image2d<value::hsi_f> lena_hsi = - level::transform(lena, fun::v2v::f_rgb_to_<value::hsi_f> ()); + data::transform(lena, fun::v2v::f_rgb_to_<value::hsi_f> ()); image2d<value::rgb8> lena_rgb = - level::transform(lena_hsi, fun::v2v::f_to_rgb_< value::rgb<8> > ()); + data::transform(lena_hsi, fun::v2v::f_to_rgb_< value::rgb<8> > ()); } Index: vigouroux/testfun.cc --- vigouroux/testfun.cc (revision 3923) +++ vigouroux/testfun.cc (working copy) @@ -9,7 +9,7 @@ #include <mln/io/ppm/load.hh> #include <mln/io/ppm/save.hh> #include <mln/math/round.hh> -#include <mln/level/transform.hh> +#include <mln/data/transform.hh> #include "function.hh" #include "yuv/my_yuv.hh" @@ -24,9 +24,9 @@ mln::image2d<mln::value::rgb8> lena; mln::io::ppm::load(lena, "../../img/lena.ppm"); - mln::image2d<mln::value::yuv_f> lena_hsi = mln::level::transform(lena, + mln::image2d<mln::value::yuv_f> lena_hsi = mln::data::transform(lena, mln::fun::v2v::f_rgb_to_yuv_f()); - mln::image2d<mln::value::rgb8> lena_rgb = mln::level::transform(lena_hsi, + mln::image2d<mln::value::rgb8> lena_rgb = mln::data::transform(lena_hsi, f_get_red_<mln::value::rgb8>()); } Index: folio/test/histo/compute_histo_rgb_from_ppm.cc --- folio/test/histo/compute_histo_rgb_from_ppm.cc (revision 3923) +++ folio/test/histo/compute_histo_rgb_from_ppm.cc (working copy) @@ -8,7 +8,7 @@ #include <mln/io/ppm/load.hh> #include <mln/io/ppm/save.hh> -#include <mln/level/stretch.hh> +#include <mln/data/stretch.hh> #include "../../mln/histo/compute_histo_rgb.hh" Index: folio/test/histo/projected3d.cc --- folio/test/histo/projected3d.cc (revision 3923) +++ folio/test/histo/projected3d.cc (working copy) @@ -7,8 +7,8 @@ #include <mln/core/image/dmorph/image_if.hh> #include <mln/pw/value.hh> -#include <mln/level/transform.hh> -#include <mln/level/stretch.hh> +#include <mln/data/transform.hh> +#include <mln/data/stretch.hh> #include <mln/arith/revert.hh> #include <mln/core/alias/neighb3d.hh> @@ -80,7 +80,7 @@ std::cout << " => loading " << argv[1] << "..." << std::endl; image2d<value::rgb8> ima; io::ppm::load(ima, argv[1]); -// image2d<rgb6> ima6 = level::transform(ima, rgb8to6()); +// image2d<rgb6> ima6 = data::transform(ima, rgb8to6()); std::cout << " => computing histogram..." << std::endl; image3d<unsigned> histo = histo::compute_histo_rgb<unsigned>(ima); // 6); @@ -99,8 +99,8 @@ h ); image2d<float> h_2d = accu::image::to_result(h_2d_a); - io::pgm::save( level::stretch( int_u8(), - level::transform( h_2d, + io::pgm::save( data::stretch( int_u8(), + data::transform( h_2d, take_log() ) ), "h_2d.pgm" ); } Index: folio/test/histo/classify_with_histo_rgb.cc --- folio/test/histo/classify_with_histo_rgb.cc (revision 3923) +++ folio/test/histo/classify_with_histo_rgb.cc (working copy) @@ -24,7 +24,7 @@ #include "../../mln/histo/compute_histo_rgb.hh" #include "../../mln/histo/classify_with_histo_rgb.hh" -#include <mln/level/transform.hh> +#include <mln/data/transform.hh> namespace mln { @@ -60,7 +60,7 @@ std::cout << " => loading " << argv[1] << "..." << std::endl; image2d<value::rgb8> lena; io::ppm::load(lena, argv[1]); - image2d<rgb6> ima = level::transform(lena, rgb8to6()); + image2d<rgb6> ima = data::transform(lena, rgb8to6()); // let's run ! std::cout << " => computing histogram..." << std::endl; Index: folio/test/dt/psn.cc --- folio/test/dt/psn.cc (revision 3923) +++ folio/test/dt/psn.cc (working copy) @@ -159,7 +159,7 @@ #include <mln/io/pbm/load.hh> #include <mln/io/pgm/save.hh> -#include <mln/level/stretch.hh> +#include <mln/data/stretch.hh> #include <mln/value/int_u8.hh> #include <mln/core/image/dmorph/sub_image.hh> @@ -198,7 +198,7 @@ // image2d<bool> ima = io::pbm::load("../../img/c01.pbm"); // image2d<value::int_u8> out2(out.domain()); -// level::stretch(out, out2); +// data::stretch(out, out2); // io::pgm::save(out2, "out.pgm"); } Index: folio/test/dt/psn_log.cc --- folio/test/dt/psn_log.cc (revision 3923) +++ folio/test/dt/psn_log.cc (working copy) @@ -245,7 +245,7 @@ #include <mln/io/pbm/load.hh> #include <mln/io/pgm/save.hh> -#include <mln/level/stretch.hh> +#include <mln/data/stretch.hh> #include <mln/value/int_u8.hh> #include <mln/core/image/dmorph/sub_image.hh> @@ -284,7 +284,7 @@ // image2d<bool> ima = io::pbm::load("../../img/c01.pbm"); // image2d<value::int_u8> out2(out.domain()); -// level::stretch(out, out2); +// data::stretch(out, out2); // io::pgm::save(out2, "out.pgm"); } Index: folio/test/dt/dt_maze.cc --- folio/test/dt/dt_maze.cc (revision 3923) +++ folio/test/dt/dt_maze.cc (working copy) @@ -13,7 +13,7 @@ #include <mln/io/ppm/load.hh> #include <mln/io/ppm/save.hh> #include <mln/io/pbm/save.hh> -#include <mln/level/stretch.hh> +#include <mln/data/stretch.hh> #include <mln/data/paste.hh> #include <mln/value/int_u8.hh> #include <mln/value/rgb8.hh> Index: folio/test/dt/chamfer.cc --- folio/test/dt/chamfer.cc (revision 3923) +++ folio/test/dt/chamfer.cc (working copy) @@ -7,7 +7,7 @@ #include <mln/io/pbm/load.hh> #include <mln/io/pgm/save.hh> -#include <mln/level/stretch.hh> +#include <mln/data/stretch.hh> #include <mln/value/int_u8.hh> #include "../dt/chamfer.hh" @@ -44,7 +44,7 @@ out = dt::chamfer(ima, chamfer); image2d<value::int_u8> out2(out.first.domain()); - level::stretch(out.first, out2); + data::stretch(out.first, out2); io::pgm::save(out2, "out.pgm"); Index: folio/test/dt/dt_bench.cc --- folio/test/dt/dt_bench.cc (revision 3923) +++ folio/test/dt/dt_bench.cc (working copy) @@ -12,7 +12,7 @@ #include <mln/io/pbm/load.hh> #include <mln/io/pgm/save.hh> -#include <mln/level/stretch.hh> +#include <mln/data/stretch.hh> #include <mln/data/paste.hh> #include <mln/value/int_u8.hh> @@ -46,7 +46,7 @@ out = dt::raw_dmap_fast(ima, make::w_window2d(ws), 666666); image2d<value::int_u8> out2(out.domain()); - level::stretch(out, out2); + data::stretch(out, out2); io::pgm::save(out2, "out.pgm"); } Index: folio/test/dt/dt.cc --- folio/test/dt/dt.cc (revision 3923) +++ folio/test/dt/dt.cc (working copy) @@ -12,7 +12,7 @@ #include <mln/io/pbm/load.hh> #include <mln/io/pgm/save.hh> -#include <mln/level/stretch.hh> +#include <mln/data/stretch.hh> #include <mln/data/paste.hh> #include <mln/value/int_u8.hh> Index: folio/test/value/hsv.cc --- folio/test/value/hsv.cc (revision 3923) +++ folio/test/value/hsv.cc (working copy) @@ -2,7 +2,7 @@ #include <mln/io/ppm/save.hh> #include <mln/debug/println.hh> -#include <mln/level/transform.hh> +#include <mln/data/transform.hh> #include <mln/core/image/image2d.hh> #include "../../mln/fun/v2v/rgb_to_hsv.hh" #include "../../mln/value/circular.hh" @@ -23,9 +23,9 @@ image2d<value::rgb8> ima; io::ppm::load(ima, argv[1]); - image2d<hsv_16f> hsv = level::transform(ima, + image2d<hsv_16f> hsv = data::transform(ima, fun::v2v::f_rgb_to_hsv_16f); - ima = level::transform(hsv, + ima = data::transform(hsv, fun::v2v::f_hsv_to_rgb_8f); std::cout << " => saving " << argv[2] << "..." << std::endl; Index: folio/mln/dt/dt_old/psn.cc --- folio/mln/dt/dt_old/psn.cc (revision 3923) +++ folio/mln/dt/dt_old/psn.cc (working copy) @@ -159,7 +159,7 @@ #include <mln/io/pbm/load.hh> #include <mln/io/pgm/save.hh> -#include <mln/level/stretch.hh> +#include <mln/data/stretch.hh> #include <mln/value/int_u8.hh> #include <mln/core/image/dmorph/sub_image.hh> @@ -198,7 +198,7 @@ // image2d<bool> ima = io::pbm::load("../../img/c01.pbm"); // image2d<value::int_u8> out2(out.domain()); -// level::stretch(out, out2); +// data::stretch(out, out2); // io::pgm::save(out2, "out.pgm"); } Index: folio/mln/dt/dt_old/psn_log.cc --- folio/mln/dt/dt_old/psn_log.cc (revision 3923) +++ folio/mln/dt/dt_old/psn_log.cc (working copy) @@ -245,7 +245,7 @@ #include <mln/io/pbm/load.hh> #include <mln/io/pgm/save.hh> -#include <mln/level/stretch.hh> +#include <mln/data/stretch.hh> #include <mln/value/int_u8.hh> #include <mln/core/image/dmorph/sub_image.hh> @@ -284,7 +284,7 @@ // image2d<bool> ima = io::pbm::load("../../img/c01.pbm"); // image2d<value::int_u8> out2(out.domain()); -// level::stretch(out, out2); +// data::stretch(out, out2); // io::pgm::save(out2, "out.pgm"); } Index: folio/mln/dt/dt_old/distance_front.cc --- folio/mln/dt/dt_old/distance_front.cc (revision 3923) +++ folio/mln/dt/dt_old/distance_front.cc (working copy) @@ -38,7 +38,7 @@ #include <mln/data/fill.hh> #include <mln/debug/println.hh> #include <mln/opt/at.hh> -#include <mln/level/compare.hh> +#include <mln/data/compare.hh> #include <mln/transform/internal/distance_functor.hh> #include "distance_front_new.hh" Index: folio/mln/dt/dt_old/chamfer.cc --- folio/mln/dt/dt_old/chamfer.cc (revision 3923) +++ folio/mln/dt/dt_old/chamfer.cc (working copy) @@ -163,7 +163,7 @@ #include <mln/io/pbm/load.hh> #include <mln/io/pgm/save.hh> -#include <mln/level/stretch.hh> +#include <mln/data/stretch.hh> #include <mln/value/int_u8.hh> int main() @@ -198,7 +198,7 @@ out = dt::chamfer(ima, chamfer); image2d<value::int_u8> out2(out.first.domain()); - level::stretch(out.first, out2); + data::stretch(out.first, out2); io::pgm::save(out2, "out.pgm"); Index: folio/mln/dt/dt_old/dt.cc --- folio/mln/dt/dt_old/dt.cc (revision 3923) +++ folio/mln/dt/dt_old/dt.cc (working copy) @@ -12,7 +12,7 @@ #include <mln/io/pbm/load.hh> #include <mln/io/pgm/save.hh> -#include <mln/level/stretch.hh> +#include <mln/data/stretch.hh> #include <mln/value/int_u8.hh> #include <mln/core/image/dmorph/sub_image.hh> @@ -53,7 +53,7 @@ // image2d<bool> ima = io::pbm::load("../../img/c01.pbm"); // image2d<value::int_u8> out2(out.domain()); -// level::stretch(out, out2); +// data::stretch(out, out2); // io::pgm::save(out2, "out.pgm"); } Index: beguin/irm_g.cc --- beguin/irm_g.cc (revision 3923) +++ beguin/irm_g.cc (working copy) @@ -14,7 +14,7 @@ #include <mln/io/pgm/save.hh> #include <mln/value/int_u8.hh> -#include <mln/level/transform.hh> +#include <mln/data/transform.hh> #include <mln/convert/to_window.hh> #include <mln/convert/to_image.hh> @@ -25,7 +25,7 @@ #include <mln/morpho/meyer_wst.hh> #include <mln/accu/mean.hh> -#include <mln/level/take.hh> +#include <mln/data/take.hh> #include <mln/util/graph.hh> @@ -56,7 +56,7 @@ // if (lbl(p) == 82) // m.take(irm(p)); -// level::take(irm | (pw::value(lbl) == pw::cst(82)), m); +// data::take(irm | (pw::value(lbl) == pw::cst(82)), m); // std::cout << "reg 82 has mean = " << m << std::endl; } @@ -175,7 +175,7 @@ unsigned nbasins; image2d<unsigned> wshed = morpho::meyer_wst(clo, c4(), nbasins); std::cout << "nbasins = " << nbasins << std::endl; - io::pgm::save( level::transform(wshed, convert::to_fun(foo)), + io::pgm::save( data::transform(wshed, convert::to_fun(foo)), "tmp_wshed.pgm" ); // doit(irm, wshed, nbasins); Index: beguin/segm_to_pregraph.hh --- beguin/segm_to_pregraph.hh (revision 3923) +++ beguin/segm_to_pregraph.hh (working copy) @@ -59,7 +59,7 @@ } } //io::pgm::save(retour, "tmp_pregraphe.pgm"); - io::pgm::save( level::transform(retour, convert::to_fun(foo)), + io::pgm::save( data::transform(retour, convert::to_fun(foo)), "tmp_pregraph.pgm" ); //return retour; } Index: beguin/irm.cc --- beguin/irm.cc (revision 3923) +++ beguin/irm.cc (working copy) @@ -23,7 +23,7 @@ #include <mln/value/rgb8.hh> #include <mln/literal/colors.hh> -#include <mln/level/transform.hh> +#include <mln/data/transform.hh> #include <mln/convert/to_window.hh> #include <mln/convert/to_image.hh> @@ -34,7 +34,7 @@ #include <mln/morpho/meyer_wst.hh> #include <mln/accu/mean.hh> -#include <mln/level/take.hh> +#include <mln/data/take.hh> #include <mln/util/graph.hh> @@ -76,7 +76,7 @@ } } - io::pgm::save(level::transform(carte, convert::to_fun(foo)), + io::pgm::save(data::transform(carte, convert::to_fun(foo)), "tmp_region_10.pgm"); } @@ -94,7 +94,7 @@ // if (lbl(p) == 82) // m.take(irm(p)); -// level::take(irm | (pw::value(lbl) == pw::cst(82)), m); +// data::take(irm | (pw::value(lbl) == pw::cst(82)), m); // std::cout << "reg 82 has mean = " << m << std::endl; // } @@ -177,7 +177,7 @@ // for (unsigned i = 0; i <= nlabels; ++i) // { // accu::mean_<unsigned> m; -// level::take(irm | (pw::value(lbl) == pw::cst(i)), m); +// data::take(irm | (pw::value(lbl) == pw::cst(i)), m); // g.add_vertex(m.to_result()); // } // // Edges. @@ -246,7 +246,7 @@ for (unsigned i = 0; i <= nlabels; ++i) { accu::mean_<mln_value(J)> m; - level::take(input | (pw::value(label) == pw::cst(i)), m); + data::take(input | (pw::value(label) == pw::cst(i)), m); g.add_vertex(m); } // Edges. @@ -478,7 +478,7 @@ unsigned nbasins; image2d<unsigned> wshed = morpho::meyer_wst(clo, c4(), nbasins); std::cout << "nbasins = " << nbasins << std::endl; - io::pgm::save( level::transform(wshed, convert::to_fun(foo)), + io::pgm::save( data::transform(wshed, convert::to_fun(foo)), "tmp_wshed.pgm" ); //typedef fusion_graph<unsigned int, void> _fg; Index: laurent/ismm2009.cc --- laurent/ismm2009.cc (revision 3923) +++ laurent/ismm2009.cc (working copy) @@ -16,7 +16,7 @@ # include <mln/core/site_set/p_queue.hh> # include <mln/core/site_set/p_priority.hh> -#include <mln/level/stretch.hh> +#include <mln/data/stretch.hh> #include <mln/labeling/compute.hh> #include <mln/accu/count.hh> @@ -1099,7 +1099,7 @@ image2d<A> output(f_.domain()); data::fill(output, 0); data::paste(aa_line, output); - io::pgm::save(level::stretch(int_u8(), output), + io::pgm::save(data::stretch(int_u8(), output), argv[3]); // image2d<int_u8> output(f_.domain()); Index: laurent/playing_with_attributes.cc --- laurent/playing_with_attributes.cc (revision 3923) +++ laurent/playing_with_attributes.cc (working copy) @@ -14,7 +14,7 @@ #include <mln/labeling/regional_minima.hh> #include <mln/core/site_set/p_array.hh> -#include <mln/level/sort_psites.hh> +#include <mln/data/sort_psites.hh> #include <mln/geom/nsites.hh> #include <mln/accu/count.hh> @@ -127,7 +127,7 @@ node_only.t = &t; typedef p_array<P> S; - S s = level::sort_psites_increasing(a | node_only); + S s = data::sort_psites_increasing(a | node_only); mln_invariant(geom::nsites(a | t.nodes()) == s.nsites()); @@ -280,7 +280,7 @@ node_only.t = &t; typedef p_array<P> S; - S s = level::sort_psites_increasing(a | node_only); + S s = data::sort_psites_increasing(a | node_only); mln_invariant(geom::nsites(a | t.nodes()) == s.nsites()); mln_fwd_piter(S) p(s); @@ -320,7 +320,7 @@ { typedef p_array<mln_site(I)> S; - S s = level::sort_psites_decreasing(g); + S s = data::sort_psites_decreasing(g); typedef morpho::tree::data<I,S> tree_t; tree_t t(g, s, nbh); Index: delmon/minsurf/main.cc --- delmon/minsurf/main.cc (revision 3923) +++ delmon/minsurf/main.cc (working copy) @@ -160,12 +160,12 @@ io::pgm::load (in, file_in); image2d<float> g; - g = level::transform(morpho::gradient(in, win_c4p()), g_functor(0)); + g = data::transform(morpho::gradient(in, win_c4p()), g_functor(0)); image2d<value::int_u8> fseeds; io::pgm::load (fseeds, file_seeds); - image2d<bool> seeds = level::transform(in, fseeds, seeds_functor()); + image2d<bool> seeds = data::transform(in, fseeds, seeds_functor()); //image2d<point2d> closest = transform::closest_point_geodesic(seeds, c4(), // value:: int_u8(std::max(in.nrows(), // in.ncols())));