[Olena-patches] cleanup-2008 2171: Move site set files in the proper core sub-directory.

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud &lt;thierry.geraud(a)lrde.epita.fr&gt; Move site set files in the proper core sub-directory. Move site_set files from mln/core/ to mln/core/site_set/. * mln/core/box.hh,. * mln/core/box_piter.hh,. * mln/core/line2d.hh,. * mln/core/p_array.hh,. * mln/core/p_bgraph.hh,. * mln/core/p_bgraph_piter.hh,. * mln/core/p_graph.hh,. * mln/core/p_graph_piter.hh,. * mln/core/p_line_graph.hh,. * mln/core/p_line_graph_piter.hh,. * mln/core/p_priority_queue.hh,. * mln/core/p_queue.hh,. * mln/core/p_queue_fast.hh,. * mln/core/p_run.hh,. * mln/core/p_set.hh,. * mln/core/pset_if.hh: Rename as... * mln/core/site_set/box.hh, * mln/core/site_set/box_piter.hh, * mln/core/site_set/line2d.hh, * mln/core/site_set/p_array.hh, * mln/core/site_set/p_bgraph.hh, * mln/core/site_set/p_bgraph_piter.hh, * mln/core/site_set/p_graph.hh, * mln/core/site_set/p_graph_piter.hh, * mln/core/site_set/p_line_graph.hh, * mln/core/site_set/p_line_graph_piter.hh, * mln/core/site_set/p_priority_queue.hh, * mln/core/site_set/p_queue.hh, * mln/core/site_set/p_queue_fast.hh, * mln/core/site_set/p_run.hh, * mln/core/site_set/p_set.hh, * mln/core/site_set/pset_if.hh: ...these. Update guards. * tests/core/p_priority_queue.cc, * tests/core/p_set.cc, * tests/core/point_set_compatibility.cc, * tests/core/p_queue_fast.cc, * tests/core/p_bgraph.cc, * tests/core/pset_if.cc, * tests/core/p_array.cc, * tests/core/p_queue.cc, * tests/draw/graph.cc, * tests/level/sort_psites_full.cc, * tests/level/sort_psites.cc, * tests/convert/to_p_array.cc, * tests/convert/to_image.cc, * tests/geom/pmin_pmax.cc, * tests/geom/bbox.cc, * tests/set/is_subset_of.cc, * tests/display/color_pretty.cc, * tests/util/tree_to_image.cc, * tests/util/tree_fast_to_image.cc, * doc/tutorial/examples/p_line2d.cc, * doc/tutorial/examples/p_array.cc, * doc/tutorial/examples/p_array.2.cc, * doc/tutorial/examples/p_image.cc, * doc/tutorial/examples/p_queue.cc, * doc/tutorial/examples/window.cc, * doc/tutorial/examples/image2d.cc, * doc/tutorial/examples/image_safe.cc, * doc/tutorial/examples/proxy.cc, * doc/tutorial/examples/p_mutable_array_of.cc, * mln/debug/println_with_border.spe.hh, * mln/debug/println.spe.hh, * mln/core/line_graph_image.hh, * mln/core/internal/graph_vicinity_piter.hh, * mln/core/internal/image_if_base.hh, * mln/core/internal/line_graph_vicinity_piter.hh, * mln/core/p_priority_queue_fast.hh, * mln/core/bgraph_image.hh, * mln/core/p_priority_queue_fast_with_array.hh, * mln/core/obased_rle_image.hh, * mln/core/graph_image.hh, * mln/core/line_graph_psite.hh, * mln/core/box1d.hh, * mln/core/box3d.hh, * mln/core/alias/p_run2d.hh, * mln/core/pset_if_piter.hh, * mln/core/p_array_piter.hh, * mln/core/p_array_bb.hh, * mln/core/t_image.hh, * mln/core/bgraph_psite.hh, * mln/core/p_image2d_piter.hh, * mln/core/image_if.hh, * mln/core/graph_psite.hh, * mln/core/clock_neighb.hh, * mln/core/line_piter.hh, * mln/core/site_set/p_image.hh, * mln/core/site_set/p_key.hh, * mln/core/box2d.hh, * mln/core/box2d_h.hh, * mln/core/p_run_piter.hh, * mln/core/mono_obased_rle_image.hh, * mln/core/concept/window.hh, * mln/core/sparse_image.hh, * mln/core/p_runs.hh, * mln/draw/graph.hh, * mln/draw/line.hh, * mln/draw/plot.hh, * mln/draw/label.hh, * mln/accu/bbox.hh, * mln/make/voronoi.hh, * mln/convert/impl/from_image_to_site_set.hh, * mln/convert/to_p_set.hh, * mln/convert/to_p_array.hh, * mln/geom/seeds2tiling.hh, * mln/display/color_pretty.hh, * mln/util/tree_to_image.hh, * mln/util/tree_fast_to_image.hh, * mln/labeling/blobs.hh, * sandbox/pellegrin/set/test/p_queue_fast.cc, * sandbox/pellegrin/set/test/p_bgraph.cc, * sandbox/pellegrin/set/test/p_queue.cc, * sandbox/pellegrin/set/test/p_priority_queue.cc, * sandbox/pellegrin/set/test/pset_if.cc, * sandbox/pellegrin/set/test/p_set.cc, * sandbox/pellegrin/set/core/p_priority_queue_fast.hh, * sandbox/pellegrin/set/core/p_bgraph.hh, * sandbox/pellegrin/set/core/p_run.hh, * sandbox/pellegrin/set/core/p_line_graph.hh, * sandbox/pellegrin/set/core/pset_if.hh, * sandbox/pellegrin/set/core/p_array.hh, * sandbox/pellegrin/set/core/p_queue.hh, * sandbox/pellegrin/set/core/p_priority_queue.hh, * sandbox/pellegrin/set/core/p_runs.hh, * sandbox/pellegrin/set/core/p_set.hh, * sandbox/pellegrin/set/core/p_priority_queue_fast_with_array.hh, * sandbox/pellegrin/set/core/line2d.hh, * sandbox/pellegrin/set/core/p_graph.hh, * sandbox/pellegrin/set/core/p_queue_fast.hh, * sandbox/aroumougame/skeleton/miscellenous.hh, * sandbox/aroumougame/skeleton/thinning.hh, * sandbox/jardonnet/registration/tools.hh, * sandbox/jardonnet/registration/quat7.hh, * sandbox/jardonnet/registration/cloud.hh, * sandbox/geraud/fllt/fllt.hh, * sandbox/geraud/fllt/fllt.svg.1.cc, * sandbox/geraud/fllt/fllt.svg.7.hh, * sandbox/geraud/fllt/fllt.svg.2.cc, * sandbox/geraud/fllt/fllt.svg.3.cc, * sandbox/geraud/fllt/fllt.svg.4.cc, * sandbox/geraud/fllt/fllt.svg.5.cc, * sandbox/geraud/fllt/fllt.svg.6.cc, * sandbox/geraud/fllt/fllt_test.hh, * sandbox/geraud/fllt.svg.7.hh, * sandbox/geraud/p_runs__with_dedicated_piter.hh, * sandbox/geraud/fllt.svg.6.cc, * sandbox/geraud/cs2d/cs2d_morpho.hh, * sandbox/garrigues/level_set.hh, * sandbox/garrigues/fllt/fllt_simple.svg.1.cc, * sandbox/garrigues/fllt/fllt_simple.svg.3.cc, * sandbox/garrigues/fllt/fllt_simple.cc, * sandbox/garrigues/fllt/types.hh, * sandbox/garrigues/fllt/fllt_theo.cc, * sandbox/garrigues/fllt/fllt_types.hh, * sandbox/garrigues/fllt/fllt_simple.svg.2.cc, * sandbox/garrigues/fllt/fllt.hh, * sandbox/garrigues/fllt/give_confs.cc, * sandbox/abraham/tests/morpho/test_component_tree.cc, * sandbox/abraham/tests/morpho/test_watershed.cc, * sandbox/abraham/tests/morpho/test_watershed_topo.cc, * sandbox/abraham/mln/morpho/basic_najman.hh: Update. doc/tutorial/examples/image2d.cc | 2 +- doc/tutorial/examples/image_safe.cc | 2 +- doc/tutorial/examples/p_array.2.cc | 2 +- doc/tutorial/examples/p_array.cc | 2 +- doc/tutorial/examples/p_image.cc | 2 +- doc/tutorial/examples/p_line2d.cc | 4 ++-- doc/tutorial/examples/p_mutable_array_of.cc | 2 +- doc/tutorial/examples/p_queue.cc | 6 +++--- doc/tutorial/examples/proxy.cc | 2 +- doc/tutorial/examples/window.cc | 2 +- mln/accu/bbox.hh | 2 +- mln/convert/impl/from_image_to_site_set.hh | 2 +- mln/convert/to_p_array.hh | 2 +- mln/convert/to_p_set.hh | 2 +- mln/core/alias/p_run2d.hh | 2 +- mln/core/bgraph_image.hh | 2 +- mln/core/bgraph_psite.hh | 2 +- mln/core/box1d.hh | 8 ++++---- mln/core/box2d.hh | 8 ++++---- mln/core/box2d_h.hh | 8 ++++---- mln/core/box3d.hh | 8 ++++---- mln/core/clock_neighb.hh | 2 +- mln/core/concept/window.hh | 2 +- mln/core/graph_image.hh | 2 +- mln/core/graph_psite.hh | 2 +- mln/core/image_if.hh | 2 +- mln/core/internal/graph_vicinity_piter.hh | 2 +- mln/core/internal/image_if_base.hh | 2 +- mln/core/internal/line_graph_vicinity_piter.hh | 2 +- mln/core/line_graph_image.hh | 2 +- mln/core/line_graph_psite.hh | 2 +- mln/core/line_piter.hh | 2 +- mln/core/mono_obased_rle_image.hh | 2 +- mln/core/obased_rle_image.hh | 2 +- mln/core/p_array_bb.hh | 8 ++++---- mln/core/p_array_piter.hh | 8 ++++---- mln/core/p_image2d_piter.hh | 2 +- mln/core/p_priority_queue_fast.hh | 8 ++++---- mln/core/p_priority_queue_fast_with_array.hh | 8 ++++---- mln/core/p_run_piter.hh | 8 ++++---- mln/core/p_runs.hh | 8 ++++---- mln/core/pset_if_piter.hh | 8 ++++---- mln/core/site_set/box.hh | 10 +++++----- mln/core/site_set/box_piter.hh | 8 ++++---- mln/core/site_set/line2d.hh | 2 +- mln/core/site_set/p_array.hh | 8 ++++---- mln/core/site_set/p_bgraph.hh | 4 ++-- mln/core/site_set/p_bgraph_piter.hh | 8 ++++---- mln/core/site_set/p_graph.hh | 8 ++++---- mln/core/site_set/p_graph_piter.hh | 10 +++++----- mln/core/site_set/p_image.hh | 2 +- mln/core/site_set/p_key.hh | 2 +- mln/core/site_set/p_line_graph.hh | 6 +++--- mln/core/site_set/p_line_graph_piter.hh | 10 +++++----- mln/core/site_set/p_queue.hh | 10 +++++----- mln/core/site_set/p_queue_fast.hh | 10 +++++----- mln/core/site_set/p_run.hh | 8 ++++---- mln/core/site_set/p_set.hh | 10 +++++----- mln/core/site_set/pset_if.hh | 8 ++++---- mln/core/sparse_image.hh | 2 +- mln/core/t_image.hh | 2 +- mln/debug/println.spe.hh | 8 ++++---- mln/debug/println_with_border.spe.hh | 8 ++++---- mln/display/color_pretty.hh | 2 +- mln/draw/graph.hh | 2 +- mln/draw/label.hh | 2 +- mln/draw/line.hh | 2 +- mln/draw/plot.hh | 2 +- mln/geom/seeds2tiling.hh | 2 +- mln/labeling/blobs.hh | 2 +- mln/make/voronoi.hh | 2 +- mln/util/tree_fast_to_image.hh | 2 +- mln/util/tree_to_image.hh | 2 +- sandbox/abraham/mln/morpho/basic_najman.hh | 2 +- sandbox/abraham/tests/morpho/test_component_tree.cc | 2 +- sandbox/abraham/tests/morpho/test_watershed.cc | 2 +- sandbox/abraham/tests/morpho/test_watershed_topo.cc | 2 +- sandbox/aroumougame/skeleton/miscellenous.hh | 2 +- sandbox/aroumougame/skeleton/thinning.hh | 2 +- sandbox/garrigues/fllt/fllt.hh | 4 ++-- sandbox/garrigues/fllt/fllt_simple.cc | 4 ++-- sandbox/garrigues/fllt/fllt_simple.svg.1.cc | 2 +- sandbox/garrigues/fllt/fllt_simple.svg.2.cc | 2 +- sandbox/garrigues/fllt/fllt_simple.svg.3.cc | 4 ++-- sandbox/garrigues/fllt/fllt_theo.cc | 2 +- sandbox/garrigues/fllt/fllt_types.hh | 2 +- sandbox/garrigues/fllt/give_confs.cc | 2 +- sandbox/garrigues/fllt/types.hh | 2 +- sandbox/garrigues/level_set.hh | 4 ++-- sandbox/geraud/cs2d/cs2d_morpho.hh | 2 +- sandbox/geraud/fllt.svg.6.cc | 4 ++-- sandbox/geraud/fllt.svg.7.hh | 4 ++-- sandbox/geraud/fllt/fllt.hh | 4 ++-- sandbox/geraud/fllt/fllt.svg.1.cc | 2 +- sandbox/geraud/fllt/fllt.svg.2.cc | 2 +- sandbox/geraud/fllt/fllt.svg.3.cc | 2 +- sandbox/geraud/fllt/fllt.svg.4.cc | 2 +- sandbox/geraud/fllt/fllt.svg.5.cc | 2 +- sandbox/geraud/fllt/fllt.svg.6.cc | 4 ++-- sandbox/geraud/fllt/fllt.svg.7.hh | 4 ++-- sandbox/geraud/fllt/fllt_test.hh | 4 ++-- sandbox/geraud/p_runs__with_dedicated_piter.hh | 8 ++++---- sandbox/jardonnet/registration/cloud.hh | 2 +- sandbox/jardonnet/registration/quat7.hh | 2 +- sandbox/jardonnet/registration/tools.hh | 2 +- sandbox/pellegrin/set/core/line2d.hh | 8 ++++---- sandbox/pellegrin/set/core/p_array.hh | 8 ++++---- sandbox/pellegrin/set/core/p_bgraph.hh | 10 +++++----- sandbox/pellegrin/set/core/p_graph.hh | 10 +++++----- sandbox/pellegrin/set/core/p_line_graph.hh | 10 +++++----- sandbox/pellegrin/set/core/p_priority_queue.hh | 10 +++++----- sandbox/pellegrin/set/core/p_priority_queue_fast.hh | 8 ++++---- sandbox/pellegrin/set/core/p_priority_queue_fast_with_array.hh | 8 ++++---- sandbox/pellegrin/set/core/p_queue.hh | 8 ++++---- sandbox/pellegrin/set/core/p_queue_fast.hh | 8 ++++---- sandbox/pellegrin/set/core/p_run.hh | 8 ++++---- sandbox/pellegrin/set/core/p_runs.hh | 8 ++++---- sandbox/pellegrin/set/core/p_set.hh | 10 +++++----- sandbox/pellegrin/set/core/pset_if.hh | 8 ++++---- sandbox/pellegrin/set/test/p_bgraph.cc | 2 +- sandbox/pellegrin/set/test/p_priority_queue.cc | 2 +- sandbox/pellegrin/set/test/p_queue.cc | 2 +- sandbox/pellegrin/set/test/p_queue_fast.cc | 2 +- sandbox/pellegrin/set/test/p_set.cc | 2 +- sandbox/pellegrin/set/test/pset_if.cc | 4 ++-- tests/convert/to_image.cc | 2 +- tests/convert/to_p_array.cc | 2 +- tests/core/p_array.cc | 2 +- tests/core/p_bgraph.cc | 2 +- tests/core/p_priority_queue.cc | 2 +- tests/core/p_queue.cc | 2 +- tests/core/p_queue_fast.cc | 2 +- tests/core/p_set.cc | 2 +- tests/core/point_set_compatibility.cc | 6 +++--- tests/core/pset_if.cc | 4 ++-- tests/display/color_pretty.cc | 2 +- tests/draw/graph.cc | 2 +- tests/geom/bbox.cc | 2 +- tests/geom/pmin_pmax.cc | 2 +- tests/level/sort_psites.cc | 2 +- tests/level/sort_psites_full.cc | 2 +- tests/set/is_subset_of.cc | 2 +- tests/util/tree_fast_to_image.cc | 2 +- tests/util/tree_to_image.cc | 2 +- 144 files changed, 295 insertions(+), 295 deletions(-) Index: tests/core/p_priority_queue.cc --- tests/core/p_priority_queue.cc (revision 2170) +++ tests/core/p_priority_queue.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/core/point2d.hh> -#include <mln/core/p_priority_queue.hh> +#include <mln/core/site_set/p_priority_queue.hh> int main () { Index: tests/core/p_set.cc --- tests/core/p_set.cc (revision 2170) +++ tests/core/p_set.cc (working copy) @@ -33,7 +33,7 @@ #include <iterator> #include <mln/core/point2d.hh> -#include <mln/core/p_set.hh> +#include <mln/core/site_set/p_set.hh> Index: tests/core/point_set_compatibility.cc --- tests/core/point_set_compatibility.cc (revision 2170) +++ tests/core/point_set_compatibility.cc (working copy) @@ -31,10 +31,10 @@ #include <mln/core/point2d.hh> -#include <mln/core/p_array.hh> -#include <mln/core/p_set.hh> +#include <mln/core/site_set/p_array.hh> +#include <mln/core/site_set/p_set.hh> #include <mln/core/graph_psite.hh> -#include <mln/core/p_graph_piter.hh> +#include <mln/core/site_set/p_graph_piter.hh> int main() Index: tests/core/p_queue_fast.cc --- tests/core/p_queue_fast.cc (revision 2170) +++ tests/core/p_queue_fast.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/core/point2d.hh> -#include <mln/core/p_queue_fast.hh> +#include <mln/core/site_set/p_queue_fast.hh> Index: tests/core/p_bgraph.cc --- tests/core/p_bgraph.cc (revision 2170) +++ tests/core/p_bgraph.cc (working copy) @@ -28,7 +28,7 @@ /// \file tests/core/p_bgraph.cc /// \brief Tests on mln::p_bgraph (the psite based on boost-graph). -#include <mln/core/p_bgraph.hh> +#include <mln/core/site_set/p_bgraph.hh> #include <mln/core/point2d.hh> #include <mln/util/internal/boost_graph.hh> #include <boost/typeof/std/utility.hpp> Index: tests/core/pset_if.cc --- tests/core/pset_if.cc (revision 2170) +++ tests/core/pset_if.cc (working copy) @@ -31,8 +31,8 @@ */ #include <mln/core/image2d.hh> -#include <mln/core/p_set.hh> -#include <mln/core/pset_if.hh> +#include <mln/core/site_set/p_set.hh> +#include <mln/core/site_set/pset_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/convert/to_image.hh> #include <mln/convert/to_p_set.hh> Index: tests/core/p_array.cc --- tests/core/p_array.cc (revision 2170) +++ tests/core/p_array.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/core/point2d.hh> -#include <mln/core/p_array.hh> +#include <mln/core/site_set/p_array.hh> int main() Index: tests/core/p_queue.cc --- tests/core/p_queue.cc (revision 2170) +++ tests/core/p_queue.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/core/point2d.hh> -#include <mln/core/p_queue.hh> +#include <mln/core/site_set/p_queue.hh> Index: tests/draw/graph.cc --- tests/draw/graph.cc (revision 2170) +++ tests/draw/graph.cc (working copy) @@ -40,7 +40,7 @@ #include <mln/core/point2d.hh> #include <mln/debug/println.hh> #include <mln/util/graph.hh> -#include <mln/core/p_graph.hh> +#include <mln/core/site_set/p_graph.hh> #include <mln/core/graph_psite.hh> #include <mln/draw/graph.hh> #include <mln/core/graph_image.hh> Index: tests/level/sort_psites_full.cc --- tests/level/sort_psites_full.cc (revision 2170) +++ tests/level/sort_psites_full.cc (working copy) @@ -46,7 +46,7 @@ #include <mln/value/int_s8.hh> #include <mln/value/int_s16.hh> -#include <mln/core/p_array.hh> +#include <mln/core/site_set/p_array.hh> #include <mln/debug/iota.hh> #include <mln/level/saturate.hh> Index: tests/level/sort_psites.cc --- tests/level/sort_psites.cc (revision 2170) +++ tests/level/sort_psites.cc (working copy) @@ -33,7 +33,7 @@ #include <mln/core/image2d.hh> #include <mln/debug/iota.hh> #include <mln/level/sort_psites.hh> -#include <mln/core/p_array.hh> +#include <mln/core/site_set/p_array.hh> int main () Index: tests/convert/to_p_array.cc --- tests/convert/to_p_array.cc (revision 2170) +++ tests/convert/to_p_array.cc (working copy) @@ -32,7 +32,7 @@ #include <mln/core/point1d.hh> #include <mln/core/point2d.hh> -#include <mln/core/p_array.hh> +#include <mln/core/site_set/p_array.hh> #include <mln/win/segment1d.hh> #include <mln/win/rectangle2d.hh> Index: tests/convert/to_image.cc --- tests/convert/to_image.cc (revision 2170) +++ tests/convert/to_image.cc (working copy) @@ -32,7 +32,7 @@ #include <mln/core/image2d.hh> #include <mln/core/window2d.hh> -#include <mln/core/pset_if.hh> +#include <mln/core/site_set/pset_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/level/compare.hh> Index: tests/geom/pmin_pmax.cc --- tests/geom/pmin_pmax.cc (revision 2170) +++ tests/geom/pmin_pmax.cc (working copy) @@ -26,7 +26,7 @@ // Public License. #include <mln/core/point2d.hh> -#include <mln/core/p_set.hh> +#include <mln/core/site_set/p_set.hh> #include <mln/geom/pmin_pmax.hh> Index: tests/geom/bbox.cc --- tests/geom/bbox.cc (revision 2170) +++ tests/geom/bbox.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <mln/core/p_set.hh> +#include <mln/core/site_set/p_set.hh> #include <mln/core/point2d.hh> #include <mln/core/box2d.hh> Index: tests/set/is_subset_of.cc --- tests/set/is_subset_of.cc (revision 2170) +++ tests/set/is_subset_of.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/set/is_subset_of.hh> -#include <mln/core/p_set.hh> +#include <mln/core/site_set/p_set.hh> #include <mln/core/point2d.hh> int main() Index: tests/display/color_pretty.cc --- tests/display/color_pretty.cc (revision 2170) +++ tests/display/color_pretty.cc (working copy) @@ -33,7 +33,7 @@ # include <mln/core/image2d.hh> # include <mln/value/int_u8.hh> # include <mln/level/fill.hh> -# include <mln/core/p_set.hh> +# include <mln/core/site_set/p_set.hh> # include <mln/core/sub_image.hh> # include <mln/core/inplace.hh> # include <mln/value/rgb8.hh> Index: tests/util/tree_to_image.cc --- tests/util/tree_to_image.cc (revision 2170) +++ tests/util/tree_to_image.cc (working copy) @@ -35,7 +35,7 @@ #include <mln/util/tree.hh> #include <mln/core/contract.hh> #include <mln/core/image2d.hh> -#include <mln/core/p_set.hh> +#include <mln/core/site_set/p_set.hh> #include <mln/value/int_u8.hh> #include <mln/level/stretch.hh> #include <mln/level/fill.hh> Index: tests/util/tree_fast_to_image.cc --- tests/util/tree_fast_to_image.cc (revision 2170) +++ tests/util/tree_fast_to_image.cc (working copy) @@ -35,7 +35,7 @@ #include <mln/util/tree_fast.hh> #include <mln/core/contract.hh> #include <mln/core/image2d.hh> -#include <mln/core/p_set.hh> +#include <mln/core/site_set/p_set.hh> #include <mln/value/int_u8.hh> #include <mln/level/stretch.hh> #include <mln/level/fill.hh> Index: doc/tutorial/examples/p_line2d.cc --- doc/tutorial/examples/p_line2d.cc (revision 2170) +++ doc/tutorial/examples/p_line2d.cc (working copy) @@ -1,8 +1,8 @@ # include <mln/core/image2d.hh> # include <mln/pw/all.hh> -# include <mln/core/line2d.hh> -# include <mln/core/p_set.hh> +# include <mln/core/site_set/line2d.hh> +# include <mln/core/site_set/p_set.hh> # include <mln/core/sub_image.hh> # include <mln/level/fill.hh> Index: doc/tutorial/examples/p_array.cc --- doc/tutorial/examples/p_array.cc (revision 2170) +++ doc/tutorial/examples/p_array.cc (working copy) @@ -1,5 +1,5 @@ # include <mln/core/image2d.hh> -# include <mln/core/p_array.hh> +# include <mln/core/site_set/p_array.hh> # include <mln/debug/println.hh> # include <mln/level/fill.hh> Index: doc/tutorial/examples/p_array.2.cc --- doc/tutorial/examples/p_array.2.cc (revision 2170) +++ doc/tutorial/examples/p_array.2.cc (working copy) @@ -1,5 +1,5 @@ # include <mln/core/image2d.hh> -# include <mln/core/p_array.hh> +# include <mln/core/site_set/p_array.hh> # include <mln/core/window.hh> # include <mln/debug/println.hh> Index: doc/tutorial/examples/p_image.cc --- doc/tutorial/examples/p_image.cc (revision 2170) +++ doc/tutorial/examples/p_image.cc (working copy) @@ -1,5 +1,5 @@ # include <mln/core/image2d.hh> -# include <mln/core/p_array.hh> +# include <mln/core/site_set/p_array.hh> # include <mln/core/site_set/p_image.hh> # include <mln/debug/println.hh> # include <mln/level/fill.hh> Index: doc/tutorial/examples/p_queue.cc --- doc/tutorial/examples/p_queue.cc (revision 2170) +++ doc/tutorial/examples/p_queue.cc (working copy) @@ -1,10 +1,10 @@ # include <mln/core/image2d.hh> -# include <mln/core/p_queue.hh> -# include <mln/core/p_queue_fast.hh> +# include <mln/core/site_set/p_queue.hh> +# include <mln/core/site_set/p_queue_fast.hh> # include <mln/debug/println.hh> # include <mln/level/fill.hh> -# include <mln/core/p_priority_queue.hh> +# include <mln/core/site_set/p_priority_queue.hh> Index: doc/tutorial/examples/window.cc --- doc/tutorial/examples/window.cc (revision 2170) +++ doc/tutorial/examples/window.cc (working copy) @@ -1,6 +1,6 @@ # include <mln/core/image2d.hh> # include <mln/core/window2d.hh> -# include <mln/core/p_array.hh> +# include <mln/core/site_set/p_array.hh> # include <mln/debug/iota.hh> # include <mln/debug/println.hh> Index: doc/tutorial/examples/image2d.cc --- doc/tutorial/examples/image2d.cc (revision 2170) +++ doc/tutorial/examples/image2d.cc (working copy) @@ -1,6 +1,6 @@ # include <mln/core/image2d.hh> # include <mln/core/window2d.hh> -# include <mln/core/p_array.hh> +# include <mln/core/site_set/p_array.hh> # include <mln/debug/iota.hh> # include <mln/debug/println.hh> Index: doc/tutorial/examples/image_safe.cc --- doc/tutorial/examples/image_safe.cc (revision 2170) +++ doc/tutorial/examples/image_safe.cc (working copy) @@ -1,5 +1,5 @@ # include <mln/core/image2d.hh> -# include <mln/core/line2d.hh> +# include <mln/core/site_set/line2d.hh> # include <mln/core/safe.hh> # include <mln/debug/println.hh> # include <mln/level/fill.hh> Index: doc/tutorial/examples/proxy.cc --- doc/tutorial/examples/proxy.cc (revision 2170) +++ doc/tutorial/examples/proxy.cc (working copy) @@ -1,5 +1,5 @@ # include <mln/core/image2d.hh> -# include <mln/core/p_array.hh> +# include <mln/core/site_set/p_array.hh> # include <mln/debug/println.hh> # include <mln/level/fill.hh> Index: doc/tutorial/examples/p_mutable_array_of.cc --- doc/tutorial/examples/p_mutable_array_of.cc (revision 2170) +++ doc/tutorial/examples/p_mutable_array_of.cc (working copy) @@ -1,6 +1,6 @@ # include <mln/core/image2d.hh> # include <mln/core/site_set/p_mutable_array_of.hh> -# include <mln/core/p_run.hh> +# include <mln/core/site_set/p_run.hh> # include <mln/convert/from_to.hh> // Used by display. Index: mln/debug/println_with_border.spe.hh --- mln/debug/println_with_border.spe.hh (revision 2170) +++ mln/debug/println_with_border.spe.hh (working copy) @@ -52,7 +52,7 @@ namespace impl { -# ifdef MLN_CORE_BOX2D_HH +# ifdef MLN_CORE_SITE_SET_BOX2D_HH // 2D version. template <typename I> @@ -69,10 +69,10 @@ } std::cout << std::endl; } -# endif // MLN_CORE_BOX2D_HH +# endif // MLN_CORE_SITE_SET_BOX2D_HH -# ifdef MLN_CORE_BOX3D_HH +# ifdef MLN_CORE_SITE_SET_BOX3D_HH // 3D version. template <typename I> @@ -104,7 +104,7 @@ std::cout << std::endl; } -# endif // MLN_CORE_BOX3D_HH +# endif // MLN_CORE_SITE_SET_BOX3D_HH } // end of namespace mln::debug::impl Index: mln/debug/println.spe.hh --- mln/debug/println.spe.hh (revision 2170) +++ mln/debug/println.spe.hh (working copy) @@ -59,7 +59,7 @@ namespace impl { -# ifdef MLN_CORE_BOX2D_HH +# ifdef MLN_CORE_SITE_SET_BOX2D_HH // 2D versions. @@ -112,7 +112,7 @@ std::cout << std::endl; } -# endif // MLN_CORE_BOX2D_HH +# endif // MLN_CORE_SITE_SET_BOX2D_HH # ifdef MLN_CORE_IMAGE2D_H_HH @@ -150,7 +150,7 @@ # endif // MLN_CORE_IMAGE2D_H_HH -# ifdef MLN_CORE_BOX3D_HH +# ifdef MLN_CORE_SITE_SET_BOX3D_HH // 3D version. template <typename I> @@ -183,7 +183,7 @@ } } -# endif // MLN_CORE_BOX3D_HH +# endif // MLN_CORE_SITE_SET_BOX3D_HH } // end of namespace mln::debug::impl Index: mln/core/line_graph_image.hh --- mln/core/line_graph_image.hh (revision 2170) +++ mln/core/line_graph_image.hh (working copy) @@ -35,7 +35,7 @@ # include <mln/core/internal/image_primary.hh> # include <mln/algebra/vec.hh> -# include <mln/core/p_line_graph.hh> +# include <mln/core/site_set/p_line_graph.hh> # include <mln/core/line_graph_psite.hh> # include <mln/value/set.hh> # include <vector> Index: mln/core/internal/graph_vicinity_piter.hh --- mln/core/internal/graph_vicinity_piter.hh (revision 2170) +++ mln/core/internal/graph_vicinity_piter.hh (working copy) @@ -38,7 +38,7 @@ - mln::internal::line_graph_vicinity_piter.hh */ # include <mln/core/concept/site_iterator.hh> -# include <mln/core/p_graph.hh> +# include <mln/core/site_set/p_graph.hh> # include <mln/core/graph_psite.hh> /* FIXME: Due to the poor interface of mln::p_graph and Index: mln/core/internal/image_if_base.hh --- mln/core/internal/image_if_base.hh (revision 2170) +++ mln/core/internal/image_if_base.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/internal/image_domain_morpher.hh> -# include <mln/core/pset_if.hh> +# include <mln/core/site_set/pset_if.hh> # include <mln/pw/all.hh> # include <mln/value/interval.hh> Index: mln/core/internal/line_graph_vicinity_piter.hh --- mln/core/internal/line_graph_vicinity_piter.hh (revision 2170) +++ mln/core/internal/line_graph_vicinity_piter.hh (working copy) @@ -40,7 +40,7 @@ # include <set> # include <mln/core/concept/site_iterator.hh> -# include <mln/core/p_line_graph.hh> +# include <mln/core/site_set/p_line_graph.hh> # include <mln/core/line_graph_psite.hh> namespace mln Index: mln/core/p_priority_queue_fast.hh --- mln/core/p_priority_queue_fast.hh (revision 2170) +++ mln/core/p_priority_queue_fast.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_PRIORITY_QUEUE_FAST_HH -# define MLN_CORE_P_PRIORITY_QUEUE_FAST_HH +#ifndef MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_FAST_HH +# define MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_FAST_HH /*! \file mln/core/p_priority_queue_fast.hh * @@ -43,7 +43,7 @@ # include <mln/core/internal/site_set_base.hh> # include <mln/core/p_array_piter.hh> # include <mln/accu/bbox.hh> -# include <mln/core/p_queue_fast.hh> +# include <mln/core/site_set/p_queue_fast.hh> namespace mln { @@ -347,4 +347,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_P_PRIORITY_QUEUE_FAST_HH +#endif // ! MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_FAST_HH Index: mln/core/bgraph_image.hh --- mln/core/bgraph_image.hh (revision 2170) +++ mln/core/bgraph_image.hh (working copy) @@ -35,7 +35,7 @@ # include <mln/core/internal/image_primary.hh> # include <mln/algebra/vec.hh> -# include <mln/core/p_bgraph.hh> +# include <mln/core/site_set/p_bgraph.hh> # include <mln/core/bgraph_psite.hh> # include <mln/value/set.hh> # include <vector> Index: mln/core/p_priority_queue_fast_with_array.hh --- mln/core/p_priority_queue_fast_with_array.hh (revision 2170) +++ mln/core/p_priority_queue_fast_with_array.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_PRIORITY_QUEUE_FAST_WITH_ARRAY_HH -# define MLN_CORE_P_PRIORITY_QUEUE_FAST_WITH_ARRAY_HH +#ifndef MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_FAST_WITH_ARRAY_HH +# define MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_FAST_WITH_ARRAY_HH /*! \file mln/core/p_priority_queue_fast_with_array.hh * @@ -43,7 +43,7 @@ # include <mln/core/internal/site_set_base.hh> # include <mln/core/p_array_piter.hh> # include <mln/accu/bbox.hh> -# include <mln/core/p_queue_fast.hh> +# include <mln/core/site_set/p_queue_fast.hh> namespace mln { @@ -333,4 +333,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_P_PRIORITY_QUEUE_FAST_WITH_ARRAY_HH +#endif // ! MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_FAST_WITH_ARRAY_HH Index: mln/core/obased_rle_image.hh --- mln/core/obased_rle_image.hh (revision 2170) +++ mln/core/obased_rle_image.hh (working copy) @@ -36,7 +36,7 @@ # include <mln/core/internal/run_image.hh> # include <mln/core/p_runs.hh> # include <mln/core/runs_psite.hh> -# include <mln/core/box.hh> +# include <mln/core/site_set/box.hh> # include <mln/value/set.hh> # include <vector> Index: mln/core/graph_image.hh --- mln/core/graph_image.hh (revision 2170) +++ mln/core/graph_image.hh (working copy) @@ -35,7 +35,7 @@ # include <mln/core/internal/image_primary.hh> # include <mln/algebra/vec.hh> -# include <mln/core/p_graph.hh> +# include <mln/core/site_set/p_graph.hh> # include <mln/core/graph_psite.hh> # include <mln/value/set.hh> # include <vector> Index: mln/core/line_graph_psite.hh --- mln/core/line_graph_psite.hh (revision 2170) +++ mln/core/line_graph_psite.hh (working copy) @@ -31,7 +31,7 @@ /// \file mln/core/line_graph_psite.hh /// \brief Definition of a line graph-based point site. -# include <mln/core/p_line_graph.hh> +# include <mln/core/site_set/p_line_graph.hh> /* FIXME: This class shares a lot with graph_psite. Factor as much as possible. */ Index: mln/core/box1d.hh --- mln/core/box1d.hh (revision 2170) +++ mln/core/box1d.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_BOX1D_HH -# define MLN_CORE_BOX1D_HH +#ifndef MLN_CORE_SITE_SET_BOX1D_HH +# define MLN_CORE_SITE_SET_BOX1D_HH /*! \file mln/core/box1d.hh * @@ -34,7 +34,7 @@ * routines. */ -# include <mln/core/box.hh> +# include <mln/core/site_set/box.hh> # include <mln/core/point1d.hh> @@ -55,4 +55,4 @@ # include <mln/make/box1d.hh> -#endif // ! MLN_CORE_BOX1D_HH +#endif // ! MLN_CORE_SITE_SET_BOX1D_HH Index: mln/core/box3d.hh --- mln/core/box3d.hh (revision 2170) +++ mln/core/box3d.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_BOX3D_HH -# define MLN_CORE_BOX3D_HH +#ifndef MLN_CORE_SITE_SET_BOX3D_HH +# define MLN_CORE_SITE_SET_BOX3D_HH /*! \file mln/core/box3d.hh * @@ -34,7 +34,7 @@ * routines. */ -# include <mln/core/box.hh> +# include <mln/core/site_set/box.hh> # include <mln/core/point3d.hh> @@ -55,4 +55,4 @@ # include <mln/make/box3d.hh> -#endif // ! MLN_CORE_BOX3D_HH +#endif // ! MLN_CORE_SITE_SET_BOX3D_HH Index: mln/core/alias/p_run2d.hh --- mln/core/alias/p_run2d.hh (revision 2170) +++ mln/core/alias/p_run2d.hh (working copy) @@ -33,7 +33,7 @@ * \brief Definition of the mln::p_run2d alias. */ -# include <mln/core/p_run.hh> +# include <mln/core/site_set/p_run.hh> # include <mln/core/point2d.hh> Index: mln/core/pset_if_piter.hh --- mln/core/pset_if_piter.hh (revision 2170) +++ mln/core/pset_if_piter.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_PSET_IF_PITER_HH -# define MLN_CORE_PSET_IF_PITER_HH +#ifndef MLN_CORE_SITE_SET_PSET_IF_PITER_HH +# define MLN_CORE_SITE_SET_PSET_IF_PITER_HH /*! \file mln/core/pset_if_piter.hh * @@ -34,7 +34,7 @@ */ # include <mln/core/internal/piter_adaptor.hh> -# include <mln/core/pset_if.hh> +# include <mln/core/site_set/pset_if.hh> namespace mln @@ -128,4 +128,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_PSET_IF_PITER_HH +#endif // ! MLN_CORE_SITE_SET_PSET_IF_PITER_HH Index: mln/core/p_array_piter.hh --- mln/core/p_array_piter.hh (revision 2170) +++ mln/core/p_array_piter.hh (working copy) @@ -26,13 +26,13 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_ARRAY_PITER_HH -# define MLN_CORE_P_ARRAY_PITER_HH +#ifndef MLN_CORE_SITE_SET_P_ARRAY_PITER_HH +# define MLN_CORE_SITE_SET_P_ARRAY_PITER_HH /// \file mln/core/p_array_piter.hh /// \brief Definition of point iterators on mln::p_array. -# include <mln/core/p_array.hh> +# include <mln/core/site_set/p_array.hh> # include <mln/core/internal/site_set_iterator_base.hh> @@ -291,4 +291,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_P_ARRAY_PITER_HH +#endif // ! MLN_CORE_SITE_SET_P_ARRAY_PITER_HH Index: mln/core/p_array_bb.hh --- mln/core/p_array_bb.hh (revision 2170) +++ mln/core/p_array_bb.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_ARRAY_HH -# define MLN_CORE_P_ARRAY_HH +#ifndef MLN_CORE_SITE_SET_P_ARRAY_HH +# define MLN_CORE_SITE_SET_P_ARRAY_HH -/*! \file mln/core/p_array.hh +/*! \file mln/core/site_set/p_array.hh * * \brief Definition of a point set class based on std::vector. */ @@ -251,4 +251,4 @@ # include <mln/core/p_array_piter.hh> -#endif // ! MLN_CORE_P_ARRAY_HH +#endif // ! MLN_CORE_SITE_SET_P_ARRAY_HH Index: mln/core/t_image.hh --- mln/core/t_image.hh (revision 2170) +++ mln/core/t_image.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/internal/image_morpher.hh> -# include <mln/core/box.hh> +# include <mln/core/site_set/box.hh> # include <mln/value/set.hh> namespace mln Index: mln/core/bgraph_psite.hh --- mln/core/bgraph_psite.hh (revision 2170) +++ mln/core/bgraph_psite.hh (working copy) @@ -31,7 +31,7 @@ /// \file mln/core/bgraph_psite.hh /// \brief Definition of a boost-graph-based point site. -# include <mln/core/p_graph.hh> +# include <mln/core/site_set/p_graph.hh> namespace mln Index: mln/core/p_image2d_piter.hh --- mln/core/p_image2d_piter.hh (revision 2170) +++ mln/core/p_image2d_piter.hh (working copy) @@ -32,7 +32,7 @@ /// \brief Definition of point iterators on mln::p_image2d. # include <mln/core/p_image2d.hh> -# include <mln/core/box_piter.hh> +# include <mln/core/site_set/box_piter.hh> namespace mln Index: mln/core/image_if.hh --- mln/core/image_if.hh (revision 2170) +++ mln/core/image_if.hh (working copy) @@ -37,7 +37,7 @@ */ # include <mln/core/internal/image_domain_morpher.hh> -# include <mln/core/pset_if.hh> +# include <mln/core/site_set/pset_if.hh> # include <mln/pw/all.hh> Index: mln/core/graph_psite.hh --- mln/core/graph_psite.hh (revision 2170) +++ mln/core/graph_psite.hh (working copy) @@ -33,7 +33,7 @@ # include <mln/core/concept/point_site.hh> -# include <mln/core/p_graph.hh> +# include <mln/core/site_set/p_graph.hh> namespace mln Index: mln/core/clock_neighb.hh --- mln/core/clock_neighb.hh (revision 2170) +++ mln/core/clock_neighb.hh (working copy) @@ -36,7 +36,7 @@ # include <mln/core/concept/neighborhood.hh> # include <mln/core/internal/dpoints_base.hh> # include <mln/core/dpoint.hh> -# include <mln/core/p_array.hh> +# include <mln/core/site_set/p_array.hh> namespace mln { Index: mln/core/line_piter.hh --- mln/core/line_piter.hh (revision 2170) +++ mln/core/line_piter.hh (working copy) @@ -36,7 +36,7 @@ */ # include <mln/core/internal/site_iterator_base.hh> -# include <mln/core/box.hh> +# include <mln/core/site_set/box.hh> namespace mln { Index: mln/core/site_set/p_bgraph.hh --- mln/core/site_set/p_bgraph.hh (revision 2170) +++ mln/core/site_set/p_bgraph.hh (working copy) @@ -35,11 +35,11 @@ # include <mln/accu/bbox.hh> # include <mln/util/internal/boost_graph.hh> # include <mln/core/bgraph_psite.hh> -# include <mln/core/p_bgraph_piter.hh> +# include <mln/core/site_set/p_bgraph_piter.hh> -/// \file mln/core/p_bgraph.hh +/// \file mln/core/site_set/p_bgraph.hh /// \brief Definition of a point set based on a boost graph. namespace mln Index: mln/core/site_set/p_run.hh --- mln/core/site_set/p_run.hh (revision 2170) +++ mln/core/site_set/p_run.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_RUN_HH -# define MLN_CORE_P_RUN_HH +#ifndef MLN_CORE_SITE_SET_P_RUN_HH +# define MLN_CORE_SITE_SET_P_RUN_HH -/*! \file mln/core/p_run.hh +/*! \file mln/core/site_set/p_run.hh * * \brief Definition of a run of points. * @@ -495,4 +495,4 @@ # include <mln/core/p_run_piter.hh> -#endif // ! MLN_CORE_P_RUN_HH +#endif // ! MLN_CORE_SITE_SET_P_RUN_HH Index: mln/core/site_set/p_graph_piter.hh --- mln/core/site_set/p_graph_piter.hh (revision 2170) +++ mln/core/site_set/p_graph_piter.hh (working copy) @@ -25,14 +25,14 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_GRAPH_PITER_HH -# define MLN_CORE_P_GRAPH_PITER_HH +#ifndef MLN_CORE_SITE_SET_P_GRAPH_PITER_HH +# define MLN_CORE_SITE_SET_P_GRAPH_PITER_HH # include <mln/core/internal/site_iterator_base.hh> -# include <mln/core/p_graph.hh> +# include <mln/core/site_set/p_graph.hh> # include <mln/core/graph_psite.hh> -/// \file mln/core/p_graph_piter.hh +/// \file mln/core/site_set/p_graph_piter.hh /// \brief Definition of point iterator on graph-based point set. namespace mln @@ -505,4 +505,4 @@ } // end of mln -#endif // ! MLN_CORE_P_GRAPH_PITER_HH +#endif // ! MLN_CORE_SITE_SET_P_GRAPH_PITER_HH Index: mln/core/site_set/p_bgraph_piter.hh --- mln/core/site_set/p_bgraph_piter.hh (revision 2170) +++ mln/core/site_set/p_bgraph_piter.hh (working copy) @@ -25,16 +25,16 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_BGRAPH_PITER_HH -# define MLN_CORE_P_BGRAPH_PITER_HH +#ifndef MLN_CORE_SITE_SET_P_BGRAPH_PITER_HH +# define MLN_CORE_SITE_SET_P_BGRAPH_PITER_HH # include <utility> # include <mln/core/internal/site_iterator_base.hh> -# include <mln/core/p_bgraph.hh> +# include <mln/core/site_set/p_bgraph.hh> # include <mln/core/bgraph_psite.hh> -/*! \file mln/core/p_bgraph_piter.hh +/*! \file mln/core/site_set/p_bgraph_piter.hh * * \brief Definition of point iterator on boost-graph-based point set. */ Index: mln/core/site_set/p_line_graph.hh --- mln/core/site_set/p_line_graph.hh (revision 2170) +++ mln/core/site_set/p_line_graph.hh (working copy) @@ -34,7 +34,7 @@ # include <mln/util/graph.hh> # include <mln/util/tracked_ptr.hh> # include <mln/core/line_graph_psite.hh> -# include <mln/core/p_line_graph_piter.hh> +# include <mln/core/site_set/p_line_graph_piter.hh> /* FIXME: This class shares a lot with p_graph. Factor as much as possible. */ @@ -42,7 +42,7 @@ // FIXME: We should move the `adjacent_or_equal method' from // iterators into this class. -/// \file mln/core/p_line_graph.hh +/// \file mln/core/site_set/p_line_graph.hh /// \brief Definition of a point set based on line graph. namespace mln @@ -278,4 +278,4 @@ } // end of mln -#endif // MLN_CORE_P_GRAPH_HH +#endif // MLN_CORE_SITE_SET_P_GRAPH_HH Index: mln/core/site_set/box.hh --- mln/core/site_set/box.hh (revision 2170) +++ mln/core/site_set/box.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_BOX_HH -# define MLN_CORE_BOX_HH +#ifndef MLN_CORE_SITE_SET_BOX_HH +# define MLN_CORE_SITE_SET_BOX_HH -/*! \file mln/core/box.hh +/*! \file mln/core/site_set/box.hh * * \brief This file defines a generic box class. * @@ -339,7 +339,7 @@ } // end of namespace mln -# include <mln/core/box_piter.hh> +# include <mln/core/site_set/box_piter.hh> -#endif // ! MLN_CORE_BOX_HH +#endif // ! MLN_CORE_SITE_SET_BOX_HH Index: mln/core/site_set/pset_if.hh --- mln/core/site_set/pset_if.hh (revision 2170) +++ mln/core/site_set/pset_if.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_PSET_IF_HH -# define MLN_CORE_PSET_IF_HH +#ifndef MLN_CORE_SITE_SET_PSET_IF_HH +# define MLN_CORE_SITE_SET_PSET_IF_HH -/*! \file mln/core/pset_if.hh +/*! \file mln/core/site_set/pset_if.hh * * \brief Definition of the restriction of a point set w.r.t. a predicate. * @@ -225,4 +225,4 @@ -#endif // ! MLN_CORE_PSET_IF_HH +#endif // ! MLN_CORE_SITE_SET_PSET_IF_HH Index: mln/core/site_set/p_line_graph_piter.hh --- mln/core/site_set/p_line_graph_piter.hh (revision 2170) +++ mln/core/site_set/p_line_graph_piter.hh (working copy) @@ -25,14 +25,14 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_LINE_GRAPH_PITER_HH -# define MLN_CORE_P_LINE_GRAPH_PITER_HH +#ifndef MLN_CORE_SITE_SET_P_LINE_GRAPH_PITER_HH +# define MLN_CORE_SITE_SET_P_LINE_GRAPH_PITER_HH # include <mln/core/internal/site_iterator_base.hh> -# include <mln/core/p_line_graph.hh> +# include <mln/core/site_set/p_line_graph.hh> # include <mln/core/line_graph_psite.hh> -/// \file mln/core/p_line_graph_piter.hh +/// \file mln/core/site_set/p_line_graph_piter.hh /// \brief Definition of point iterator on line graph-based point set. namespace mln @@ -486,4 +486,4 @@ } // end of mln -#endif // ! MLN_CORE_P_LINE_GRAPH_PITER_HH +#endif // ! MLN_CORE_SITE_SET_P_LINE_GRAPH_PITER_HH Index: mln/core/site_set/box_piter.hh --- mln/core/site_set/box_piter.hh (revision 2170) +++ mln/core/site_set/box_piter.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_BOX_PITER_HH -# define MLN_CORE_BOX_PITER_HH +#ifndef MLN_CORE_SITE_SET_BOX_PITER_HH +# define MLN_CORE_SITE_SET_BOX_PITER_HH -/*! \file mln/core/box_piter.hh +/*! \file mln/core/site_set/box_piter.hh * * \brief Definition of iterators on points of boxes. */ @@ -269,4 +269,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_BOX_PITER_HH +#endif // ! MLN_CORE_SITE_SET_BOX_PITER_HH Index: mln/core/site_set/p_array.hh --- mln/core/site_set/p_array.hh (revision 2170) +++ mln/core/site_set/p_array.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_ARRAY_HH -# define MLN_CORE_P_ARRAY_HH +#ifndef MLN_CORE_SITE_SET_P_ARRAY_HH +# define MLN_CORE_SITE_SET_P_ARRAY_HH -/*! \file mln/core/p_array.hh +/*! \file mln/core/site_set/p_array.hh * * \brief Definition of a point set class based on std::vector. * @@ -732,4 +732,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_P_ARRAY_HH +#endif // ! MLN_CORE_SITE_SET_P_ARRAY_HH Index: mln/core/site_set/p_image.hh --- mln/core/site_set/p_image.hh (revision 2170) +++ mln/core/site_set/p_image.hh (working copy) @@ -37,7 +37,7 @@ * \todo Add an init method (deferred initialization). */ -# include <mln/core/pset_if.hh> +# include <mln/core/site_set/pset_if.hh> # include <mln/fun/ops.hh> # include <mln/pw/value.hh> # include <mln/pw/cst.hh> Index: mln/core/site_set/p_queue.hh --- mln/core/site_set/p_queue.hh (revision 2170) +++ mln/core/site_set/p_queue.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_QUEUE_HH -# define MLN_CORE_P_QUEUE_HH +#ifndef MLN_CORE_SITE_SET_P_QUEUE_HH +# define MLN_CORE_SITE_SET_P_QUEUE_HH -/*! \file mln/core/p_queue.hh +/*! \file mln/core/site_set/p_queue.hh * * \brief Definition of a site set based on std::deque. * @@ -40,7 +40,7 @@ */ # include <deque> -# include <mln/core/p_array.hh> +# include <mln/core/site_set/p_array.hh> namespace mln @@ -284,4 +284,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_P_QUEUE_HH +#endif // ! MLN_CORE_SITE_SET_P_QUEUE_HH Index: mln/core/site_set/p_key.hh --- mln/core/site_set/p_key.hh (revision 2170) +++ mln/core/site_set/p_key.hh (working copy) @@ -37,7 +37,7 @@ # include <map> # include <mln/core/concept/function.hh> -# include <mln/core/p_set.hh> +# include <mln/core/site_set/p_set.hh> # include <mln/core/site_set/p_double.hh> # include <mln/core/internal/site_set_base.hh> # include <mln/util/ord.hh> Index: mln/core/site_set/p_set.hh --- mln/core/site_set/p_set.hh (revision 2170) +++ mln/core/site_set/p_set.hh (working copy) @@ -25,16 +25,16 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_SET_HH -# define MLN_CORE_P_SET_HH +#ifndef MLN_CORE_SITE_SET_P_SET_HH +# define MLN_CORE_SITE_SET_P_SET_HH -/*! \file mln/core/p_set.hh +/*! \file mln/core/site_set/p_set.hh * * \brief Definition of a mathematical set of sites (based on * util::set). */ -# include <mln/core/p_array.hh> +# include <mln/core/site_set/p_array.hh> # include <mln/util/set.hh> @@ -260,4 +260,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_P_SET_HH +#endif // ! MLN_CORE_SITE_SET_P_SET_HH Index: mln/core/site_set/line2d.hh --- mln/core/site_set/line2d.hh (revision 2170) +++ mln/core/site_set/line2d.hh (working copy) @@ -34,7 +34,7 @@ * p_array). */ -# include <mln/core/p_array.hh> +# include <mln/core/site_set/p_array.hh> # include <mln/core/box2d.hh> # include <mln/math/all.hh> Index: mln/core/site_set/p_graph.hh --- mln/core/site_set/p_graph.hh (revision 2170) +++ mln/core/site_set/p_graph.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_GRAPH_HH -# define MLN_CORE_P_GRAPH_HH +#ifndef MLN_CORE_SITE_SET_P_GRAPH_HH +# define MLN_CORE_SITE_SET_P_GRAPH_HH # include <mln/core/concept/point_site.hh> # include <mln/core/internal/site_set_base.hh> @@ -35,7 +35,7 @@ # include <mln/util/graph.hh> # include <mln/core/graph_psite.hh> -# include <mln/core/p_graph_piter.hh> +# include <mln/core/site_set/p_graph_piter.hh> namespace mln @@ -335,4 +335,4 @@ } // end of mln -#endif // MLN_CORE_P_GRAPH_HH +#endif // MLN_CORE_SITE_SET_P_GRAPH_HH Index: mln/core/site_set/p_queue_fast.hh --- mln/core/site_set/p_queue_fast.hh (revision 2170) +++ mln/core/site_set/p_queue_fast.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_QUEUE_FAST_HH -# define MLN_CORE_P_QUEUE_FAST_HH +#ifndef MLN_CORE_SITE_SET_P_QUEUE_FAST_HH +# define MLN_CORE_SITE_SET_P_QUEUE_FAST_HH -/*! \file mln/core/p_queue_fast.hh +/*! \file mln/core/site_set/p_queue_fast.hh * * \brief Definition of a queue of sites that is fast but uses extra * memory w.r.t. a simple queue. @@ -36,7 +36,7 @@ * \todo Add insert. */ -# include <mln/core/p_array.hh> +# include <mln/core/site_set/p_array.hh> namespace mln @@ -327,4 +327,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_P_QUEUE_FAST_HH +#endif // ! MLN_CORE_SITE_SET_P_QUEUE_FAST_HH Index: mln/core/box2d.hh --- mln/core/box2d.hh (revision 2170) +++ mln/core/box2d.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_BOX2D_HH -# define MLN_CORE_BOX2D_HH +#ifndef MLN_CORE_SITE_SET_BOX2D_HH +# define MLN_CORE_SITE_SET_BOX2D_HH /*! \file mln/core/box2d.hh * @@ -34,7 +34,7 @@ * routines. */ -# include <mln/core/box.hh> +# include <mln/core/site_set/box.hh> # include <mln/core/point2d.hh> @@ -55,4 +55,4 @@ # include <mln/make/box2d.hh> -#endif // ! MLN_CORE_BOX2D_HH +#endif // ! MLN_CORE_SITE_SET_BOX2D_HH Index: mln/core/box2d_h.hh --- mln/core/box2d_h.hh (revision 2170) +++ mln/core/box2d_h.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_BOX2D_H_HH -# define MLN_CORE_BOX2D_H_HH +#ifndef MLN_CORE_SITE_SET_BOX2D_H_HH +# define MLN_CORE_SITE_SET_BOX2D_H_HH /*! \file mln/core/box2d_h.hh * @@ -34,7 +34,7 @@ * routines. */ -# include <mln/core/box.hh> +# include <mln/core/site_set/box.hh> # include <mln/core/box2d.hh> # include <mln/core/point2d_h.hh> @@ -54,4 +54,4 @@ # include <mln/make/box2d_h.hh> -#endif // ! MLN_CORE_BOX2D_HH +#endif // ! MLN_CORE_SITE_SET_BOX2D_HH Index: mln/core/p_run_piter.hh --- mln/core/p_run_piter.hh (revision 2170) +++ mln/core/p_run_piter.hh (working copy) @@ -25,15 +25,15 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_RUN_PITER_HH -# define MLN_CORE_P_RUN_PITER_HH +#ifndef MLN_CORE_SITE_SET_P_RUN_PITER_HH +# define MLN_CORE_SITE_SET_P_RUN_PITER_HH /*! \file mln/core/p_run_piter.hh * * \brief Definition of point iterators on mln::p_run. */ -# include <mln/core/p_run.hh> +# include <mln/core/site_set/p_run.hh> # include <mln/core/internal/site_set_iterator_base.hh> @@ -221,4 +221,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_P_RUN_PITER_HH +#endif // ! MLN_CORE_SITE_SET_P_RUN_PITER_HH Index: mln/core/mono_obased_rle_image.hh --- mln/core/mono_obased_rle_image.hh (revision 2170) +++ mln/core/mono_obased_rle_image.hh (working copy) @@ -36,7 +36,7 @@ # include <mln/core/internal/run_image.hh> # include <mln/core/p_runs.hh> # include <mln/core/runs_psite.hh> -# include <mln/core/box.hh> +# include <mln/core/site_set/box.hh> # include <mln/value/set.hh> # include <mln/core/mono_rle_image.hh> # include <vector> Index: mln/core/concept/window.hh --- mln/core/concept/window.hh (revision 2170) +++ mln/core/concept/window.hh (working copy) @@ -34,7 +34,7 @@ # include <mln/core/concept/object.hh> # include <mln/core/concept/iterator.hh> -# include <mln/core/p_array.hh> +# include <mln/core/site_set/p_array.hh> namespace mln Index: mln/core/sparse_image.hh --- mln/core/sparse_image.hh (revision 2170) +++ mln/core/sparse_image.hh (working copy) @@ -36,7 +36,7 @@ # include <vector> # include <mln/core/internal/image_primary.hh> # include <mln/core/p_set_of.hh> -# include <mln/core/p_run.hh> +# include <mln/core/site_set/p_run.hh> # include <mln/value/set.hh> Index: mln/core/p_runs.hh --- mln/core/p_runs.hh (revision 2170) +++ mln/core/p_runs.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_RUN_SET_HH -# define MLN_CORE_P_RUN_SET_HH +#ifndef MLN_CORE_SITE_SET_P_RUN_SET_HH +# define MLN_CORE_SITE_SET_P_RUN_SET_HH /*! \file mln/core/p_run_set.hh * @@ -39,7 +39,7 @@ */ # include <mln/accu/bbox.hh> -# include <mln/core/p_run.hh> +# include <mln/core/site_set/p_run.hh> # include <mln/core/site_set/p_double.hh> # include <mln/core/internal/piter_adaptor.hh> # include <mln/util/set.hh> @@ -405,4 +405,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_P_RUN_SET_HH +#endif // ! MLN_CORE_SITE_SET_P_RUN_SET_HH Index: mln/draw/graph.hh --- mln/draw/graph.hh (revision 2170) +++ mln/draw/graph.hh (working copy) @@ -34,7 +34,7 @@ # include <mln/pw/image.hh> # include <mln/level/fill.hh> # include <mln/draw/line.hh> -# include <mln/core/p_graph.hh> +# include <mln/core/site_set/p_graph.hh> # include <mln/core/graph_image.hh> namespace mln Index: mln/draw/line.hh --- mln/draw/line.hh (revision 2170) +++ mln/draw/line.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/concept/image.hh> -# include <mln/core/line2d.hh> +# include <mln/core/site_set/line2d.hh> # include <mln/level/paste.hh> # include <mln/pw/image.hh> # include <mln/pw/cst.hh> Index: mln/draw/plot.hh --- mln/draw/plot.hh (revision 2170) +++ mln/draw/plot.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/concept/image.hh> -# include <mln/core/line2d.hh> +# include <mln/core/site_set/line2d.hh> # include <mln/level/paste.hh> # include <mln/pw/image.hh> # include <mln/pw/cst.hh> Index: mln/draw/label.hh --- mln/draw/label.hh (revision 2170) +++ mln/draw/label.hh (working copy) @@ -43,7 +43,7 @@ # include <mln/value/rgb8.hh> # include <mln/level/fill.hh> # include <mln/level/paste.hh> -# include <mln/core/p_set.hh> +# include <mln/core/site_set/p_set.hh> # include <mln/metal/is_not.hh> # include <mln/core/image_if_value.hh> # include <mln/debug/println.hh> Index: mln/accu/bbox.hh --- mln/accu/bbox.hh (revision 2170) +++ mln/accu/bbox.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/accu/internal/base.hh> -# include <mln/core/box.hh> +# include <mln/core/site_set/box.hh> namespace mln Index: mln/make/voronoi.hh --- mln/make/voronoi.hh (revision 2170) +++ mln/make/voronoi.hh (working copy) @@ -37,7 +37,7 @@ # include <map> # include <mln/core/concept/neighborhood.hh> -# include <mln/core/p_graph.hh> +# include <mln/core/site_set/p_graph.hh> # include <mln/accu/mean.hh> # include <mln/estim/min_max.hh> Index: mln/convert/impl/from_image_to_site_set.hh --- mln/convert/impl/from_image_to_site_set.hh (revision 2170) +++ mln/convert/impl/from_image_to_site_set.hh (working copy) @@ -40,7 +40,7 @@ # include <utility> # include <mln/core/concept/image.hh> # include <mln/core/concept/site_set.hh> -# include <mln/core/p_run.hh> +# include <mln/core/site_set/p_run.hh> # include <mln/metal/converts_to.hh> Index: mln/convert/to_p_set.hh --- mln/convert/to_p_set.hh (revision 2170) +++ mln/convert/to_p_set.hh (working copy) @@ -38,7 +38,7 @@ # include <mln/core/concept/neighborhood.hh> # include <mln/core/concept/window.hh> # include <mln/core/concept/point_site.hh> -# include <mln/core/p_set.hh> +# include <mln/core/site_set/p_set.hh> # include <mln/pw/image.hh> # include <mln/pw/cst.hh> # include <mln/metal/templated_by.hh> Index: mln/convert/to_p_array.hh --- mln/convert/to_p_array.hh (revision 2170) +++ mln/convert/to_p_array.hh (working copy) @@ -31,7 +31,7 @@ /// \file mln/convert/to_p_array.hh /// \brief Conversions to mln::p_array. -# include <mln/core/p_array.hh> +# include <mln/core/site_set/p_array.hh> # include <mln/core/concept/image.hh> # include <mln/core/concept/window.hh> Index: mln/geom/seeds2tiling.hh --- mln/geom/seeds2tiling.hh (revision 2170) +++ mln/geom/seeds2tiling.hh (working copy) @@ -36,7 +36,7 @@ # include <map> # include <mln/core/concept/neighborhood.hh> -# include <mln/core/p_queue.hh> +# include <mln/core/site_set/p_queue.hh> # include <mln/core/clone.hh> # include <mln/accu/mean.hh> # include <mln/estim/min_max.hh> Index: mln/display/color_pretty.hh --- mln/display/color_pretty.hh (revision 2170) +++ mln/display/color_pretty.hh (working copy) @@ -40,7 +40,7 @@ # include <mln/value/rgb8.hh> # include <mln/level/fill.hh> # include <mln/level/paste.hh> -# include <mln/core/p_set.hh> +# include <mln/core/site_set/p_set.hh> # include <mln/metal/is_not.hh> namespace mln Index: mln/util/tree_to_image.hh --- mln/util/tree_to_image.hh (revision 2170) +++ mln/util/tree_to_image.hh (working copy) @@ -38,7 +38,7 @@ # include <mln/core/concept/image.hh> # include <mln/util/tree.hh> -# include <mln/core/p_set.hh> +# include <mln/core/site_set/p_set.hh> # include <mln/level/fill.hh> namespace mln Index: mln/util/tree_fast_to_image.hh --- mln/util/tree_fast_to_image.hh (revision 2170) +++ mln/util/tree_fast_to_image.hh (working copy) @@ -38,7 +38,7 @@ # include <mln/core/concept/image.hh> # include <mln/util/tree_fast.hh> -# include <mln/core/p_set.hh> +# include <mln/core/site_set/p_set.hh> # include <list> namespace mln Index: mln/labeling/blobs.hh --- mln/labeling/blobs.hh (revision 2170) +++ mln/labeling/blobs.hh (working copy) @@ -40,7 +40,7 @@ # include <mln/core/concept/image.hh> # include <mln/core/concept/neighborhood.hh> # include <mln/level/fill.hh> -# include <mln/core/p_queue_fast.hh> +# include <mln/core/site_set/p_queue_fast.hh> Index: sandbox/pellegrin/set/test/p_queue_fast.cc --- sandbox/pellegrin/set/test/p_queue_fast.cc (revision 2170) +++ sandbox/pellegrin/set/test/p_queue_fast.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/core/point2d.hh> -#include <mln/core/p_queue_fast.hh> +#include <mln/core/site_set/p_queue_fast.hh> Index: sandbox/pellegrin/set/test/p_bgraph.cc --- sandbox/pellegrin/set/test/p_bgraph.cc (revision 2170) +++ sandbox/pellegrin/set/test/p_bgraph.cc (working copy) @@ -28,7 +28,7 @@ /// \file tests/core/p_bgraph.cc /// \brief Tests on mln::p_bgraph (the psite based on boost-graph). -#include "../core/p_bgraph.hh" +#include "../core/site_set/p_bgraph.hh" #include <mln/core/point2d.hh> #include <mln/util/internal/boost_graph.hh> #include <boost/typeof/std/utility.hpp> Index: sandbox/pellegrin/set/test/p_queue.cc --- sandbox/pellegrin/set/test/p_queue.cc (revision 2170) +++ sandbox/pellegrin/set/test/p_queue.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/core/point2d.hh> -#include <mln/core/p_queue.hh> +#include <mln/core/site_set/p_queue.hh> Index: sandbox/pellegrin/set/test/p_priority_queue.cc --- sandbox/pellegrin/set/test/p_priority_queue.cc (revision 2170) +++ sandbox/pellegrin/set/test/p_priority_queue.cc (working copy) @@ -31,7 +31,7 @@ */ #include <mln/core/point2d.hh> -#include <mln/core/p_priority_queue.hh> +#include <mln/core/site_set/p_priority_queue.hh> int main () { Index: sandbox/pellegrin/set/test/pset_if.cc --- sandbox/pellegrin/set/test/pset_if.cc (revision 2170) +++ sandbox/pellegrin/set/test/pset_if.cc (working copy) @@ -31,8 +31,8 @@ */ #include <mln/core/image2d.hh> -#include <mln/core/p_set.hh> -#include <mln/core/pset_if.hh> +#include <mln/core/site_set/p_set.hh> +#include <mln/core/site_set/pset_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/convert/to_image.hh> #include <mln/convert/to_p_set.hh> Index: sandbox/pellegrin/set/test/p_set.cc --- sandbox/pellegrin/set/test/p_set.cc (revision 2170) +++ sandbox/pellegrin/set/test/p_set.cc (working copy) @@ -33,7 +33,7 @@ #include <iterator> #include <mln/core/point2d.hh> -#include <mln/core/p_set.hh> +#include <mln/core/site_set/p_set.hh> Index: sandbox/pellegrin/set/core/p_priority_queue_fast.hh --- sandbox/pellegrin/set/core/p_priority_queue_fast.hh (revision 2170) +++ sandbox/pellegrin/set/core/p_priority_queue_fast.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_PRIORITY_QUEUE_FAST_HH -# define MLN_CORE_P_PRIORITY_QUEUE_FAST_HH +#ifndef MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_FAST_HH +# define MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_FAST_HH /*! \file mln/core/p_priority_queue_fast.hh * @@ -43,7 +43,7 @@ # include <mln/core/internal/point_set_base.hh> # include <mln/core/p_array_piter.hh> # include <mln/accu/bbox.hh> -# include <mln/core/p_queue_fast.hh> +# include <mln/core/site_set/p_queue_fast.hh> # include <trait/point_set.hh> @@ -362,4 +362,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_P_PRIORITY_QUEUE_FAST_HH +#endif // ! MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_FAST_HH Index: sandbox/pellegrin/set/core/p_bgraph.hh --- sandbox/pellegrin/set/core/p_bgraph.hh (revision 2170) +++ sandbox/pellegrin/set/core/p_bgraph.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_BGRAPH_HH -# define MLN_CORE_P_BGRAPH_HH +#ifndef MLN_CORE_SITE_SET_P_BGRAPH_HH +# define MLN_CORE_SITE_SET_P_BGRAPH_HH -/// \file mln/core/p_bgraph.hh +/// \file mln/core/site_set/p_bgraph.hh /// \brief Definition of a point set based on a boost graph. # include <utility> @@ -38,7 +38,7 @@ # include <mln/accu/bbox.hh> # include <mln/util/internal/boost_graph.hh> # include <mln/core/bgraph_psite.hh> -# include <mln/core/p_bgraph_piter.hh> +# include <mln/core/site_set/p_bgraph_piter.hh> # include <trait/point_set.hh> @@ -231,4 +231,4 @@ } // end of mln -#endif // MLN_CORE_P_BGRAPH_HH +#endif // MLN_CORE_SITE_SET_P_BGRAPH_HH Index: sandbox/pellegrin/set/core/p_run.hh --- sandbox/pellegrin/set/core/p_run.hh (revision 2170) +++ sandbox/pellegrin/set/core/p_run.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_RUN_HH -# define MLN_CORE_P_RUN_HH +#ifndef MLN_CORE_SITE_SET_P_RUN_HH +# define MLN_CORE_SITE_SET_P_RUN_HH -/*! \file mln/core/p_run.hh +/*! \file mln/core/site_set/p_run.hh * * \brief Definition of a point set class based on std::set. */ @@ -247,4 +247,4 @@ # include <mln/core/p_run_piter.hh> -#endif // ! MLN_CORE_P_RUN_HH +#endif // ! MLN_CORE_SITE_SET_P_RUN_HH Index: sandbox/pellegrin/set/core/p_line_graph.hh --- sandbox/pellegrin/set/core/p_line_graph.hh (revision 2170) +++ sandbox/pellegrin/set/core/p_line_graph.hh (working copy) @@ -25,15 +25,15 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_LINE_GRAPH_HH -# define MLN_CORE_P_LINE_GRAPH_HH +#ifndef MLN_CORE_SITE_SET_P_LINE_GRAPH_HH +# define MLN_CORE_SITE_SET_P_LINE_GRAPH_HH # include <mln/core/concept/point_site.hh> # include <mln/core/internal/point_set_base.hh> # include <mln/accu/bbox.hh> # include <mln/util/graph.hh> # include <mln/core/line_graph_psite.hh> -# include <mln/core/p_line_graph_piter.hh> +# include <mln/core/site_set/p_line_graph_piter.hh> # include <mln/core/point_pair.hh> # include <trait/point_set.hh> @@ -41,7 +41,7 @@ /* FIXME: This class shares a lot with p_graph. Factor as much as possible. */ -/// \file mln/core/p_line_graph.hh +/// \file mln/core/site_set/p_line_graph.hh /// \brief Definition of a point set based on line graph. namespace mln @@ -174,4 +174,4 @@ } // end of mln -#endif // MLN_CORE_P_LINE_GRAPH_HH +#endif // MLN_CORE_SITE_SET_P_LINE_GRAPH_HH Index: sandbox/pellegrin/set/core/pset_if.hh --- sandbox/pellegrin/set/core/pset_if.hh (revision 2170) +++ sandbox/pellegrin/set/core/pset_if.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_PSET_IF_HH -# define MLN_CORE_PSET_IF_HH +#ifndef MLN_CORE_SITE_SET_PSET_IF_HH +# define MLN_CORE_SITE_SET_PSET_IF_HH -/*! \file mln/core/pset_if.hh +/*! \file mln/core/site_set/pset_if.hh * * \brief Definition of the restriction of a point set w.r.t. a predicate. */ @@ -224,4 +224,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_PSET_IF_HH +#endif // ! MLN_CORE_SITE_SET_PSET_IF_HH Index: sandbox/pellegrin/set/core/p_array.hh --- sandbox/pellegrin/set/core/p_array.hh (revision 2170) +++ sandbox/pellegrin/set/core/p_array.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_ARRAY_HH -# define MLN_CORE_P_ARRAY_HH +#ifndef MLN_CORE_SITE_SET_P_ARRAY_HH +# define MLN_CORE_SITE_SET_P_ARRAY_HH -/*! \file mln/core/p_array.hh +/*! \file mln/core/site_set/p_array.hh * * \brief Definition of a point set class based on std::vector. */ @@ -244,4 +244,4 @@ # include <mln/core/p_array_piter.hh> -#endif // ! MLN_CORE_P_ARRAY_HH +#endif // ! MLN_CORE_SITE_SET_P_ARRAY_HH Index: sandbox/pellegrin/set/core/p_queue.hh --- sandbox/pellegrin/set/core/p_queue.hh (revision 2170) +++ sandbox/pellegrin/set/core/p_queue.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_QUEUE_HH -# define MLN_CORE_P_QUEUE_HH +#ifndef MLN_CORE_SITE_SET_P_QUEUE_HH +# define MLN_CORE_SITE_SET_P_QUEUE_HH -/*! \file mln/core/p_queue.hh +/*! \file mln/core/site_set/p_queue.hh * * \brief Definition of a point set class based on std::deque. */ @@ -308,4 +308,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_P_QUEUE_HH +#endif // ! MLN_CORE_SITE_SET_P_QUEUE_HH Index: sandbox/pellegrin/set/core/p_priority_queue.hh --- sandbox/pellegrin/set/core/p_priority_queue.hh (revision 2170) +++ sandbox/pellegrin/set/core/p_priority_queue.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_PRIORITY_QUEUE_HH -# define MLN_CORE_P_PRIORITY_QUEUE_HH +#ifndef MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_HH +# define MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_HH -/*! \file mln/core/p_priority_queue.hh +/*! \file mln/core/site_set/p_priority_queue.hh * * \brief Definition of a point set class based on p_queue with * priority features. @@ -43,7 +43,7 @@ # include <mln/core/internal/point_set_base.hh> # include <mln/core/p_array_piter.hh> # include <mln/accu/bbox.hh> -# include <mln/core/p_queue.hh> +# include <mln/core/site_set/p_queue.hh> # include <trait/point_set.hh> @@ -362,4 +362,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_P_PRIORITY_QUEUE_HH +#endif // ! MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_HH Index: sandbox/pellegrin/set/core/p_runs.hh --- sandbox/pellegrin/set/core/p_runs.hh (revision 2170) +++ sandbox/pellegrin/set/core/p_runs.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_RUNS_HH -# define MLN_CORE_P_RUNS_HH +#ifndef MLN_CORE_SITE_SET_P_RUNS_HH +# define MLN_CORE_SITE_SET_P_RUNS_HH /*! \file mln/core/p_runs.hh * @@ -39,7 +39,7 @@ # include <mln/core/internal/point_set_base.hh> # include <mln/core/internal/site_iterator_base.hh> # include <mln/core/runs_psite.hh> -# include <mln/core/p_run.hh> +# include <mln/core/site_set/p_run.hh> # include <mln/accu/bbox.hh> # include <mln/util/lazy_set.hh> # include <trait/point_set.hh> @@ -538,4 +538,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_P_RUNS_HH +#endif // ! MLN_CORE_SITE_SET_P_RUNS_HH Index: sandbox/pellegrin/set/core/p_set.hh --- sandbox/pellegrin/set/core/p_set.hh (revision 2170) +++ sandbox/pellegrin/set/core/p_set.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_SET_HH -# define MLN_CORE_P_SET_HH +#ifndef MLN_CORE_SITE_SET_P_SET_HH +# define MLN_CORE_SITE_SET_P_SET_HH -/*! \file mln/core/p_set.hh +/*! \file mln/core/site_set/p_set.hh * * \brief Definition of a point set class based on std::set. */ @@ -36,7 +36,7 @@ # include <mln/core/internal/point_set_base.hh> # include <mln/core/internal/set_of.hh> # include <mln/accu/bbox.hh> -# include <mln/core/p_array.hh> +# include <mln/core/site_set/p_array.hh> # include <trait/point_set.hh> @@ -192,4 +192,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_P_SET_HH +#endif // ! MLN_CORE_SITE_SET_P_SET_HH Index: sandbox/pellegrin/set/core/p_priority_queue_fast_with_array.hh --- sandbox/pellegrin/set/core/p_priority_queue_fast_with_array.hh (revision 2170) +++ sandbox/pellegrin/set/core/p_priority_queue_fast_with_array.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_PRIORITY_QUEUE_FAST_WITH_ARRAY_HH -# define MLN_CORE_P_PRIORITY_QUEUE_FAST_WITH_ARRAY_HH +#ifndef MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_FAST_WITH_ARRAY_HH +# define MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_FAST_WITH_ARRAY_HH /*! \file mln/core/p_priority_queue_fast_with_array.hh * @@ -43,7 +43,7 @@ # include <mln/core/internal/point_set_base.hh> # include <mln/core/p_array_piter.hh> # include <mln/accu/bbox.hh> -# include <mln/core/p_queue_fast.hh> +# include <mln/core/site_set/p_queue_fast.hh> # include <trait/point_set.hh> @@ -348,4 +348,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_P_PRIORITY_QUEUE_FAST_WITH_ARRAY_HH +#endif // ! MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_FAST_WITH_ARRAY_HH Index: sandbox/pellegrin/set/core/line2d.hh --- sandbox/pellegrin/set/core/line2d.hh (revision 2170) +++ sandbox/pellegrin/set/core/line2d.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_LINE2D_HH -# define MLN_CORE_LINE2D_HH +#ifndef MLN_CORE_SITE_SET_LINE2D_HH +# define MLN_CORE_SITE_SET_LINE2D_HH -/*! \file mln/core/line2d.hh +/*! \file mln/core/site_set/line2d.hh * * \brief Definition of a point set class based on std::vector. */ @@ -209,4 +209,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_LINE2D_HH +#endif // ! MLN_CORE_SITE_SET_LINE2D_HH Index: sandbox/pellegrin/set/core/p_graph.hh --- sandbox/pellegrin/set/core/p_graph.hh (revision 2170) +++ sandbox/pellegrin/set/core/p_graph.hh (working copy) @@ -25,19 +25,19 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_GRAPH_HH -# define MLN_CORE_P_GRAPH_HH +#ifndef MLN_CORE_SITE_SET_P_GRAPH_HH +# define MLN_CORE_SITE_SET_P_GRAPH_HH # include <mln/core/concept/point_site.hh> # include <mln/core/internal/point_set_base.hh> # include <mln/accu/bbox.hh> # include <mln/util/graph.hh> # include <mln/core/graph_psite.hh> -# include <mln/core/p_graph_piter.hh> +# include <mln/core/site_set/p_graph_piter.hh> # include <trait/point_set.hh> -/// \file mln/core/p_graph.hh +/// \file mln/core/site_set/p_graph.hh /// \brief Definition of a point set based on graph. namespace mln @@ -259,4 +259,4 @@ } // end of mln -#endif // MLN_CORE_P_GRAPH_HH +#endif // MLN_CORE_SITE_SET_P_GRAPH_HH Index: sandbox/pellegrin/set/core/p_queue_fast.hh --- sandbox/pellegrin/set/core/p_queue_fast.hh (revision 2170) +++ sandbox/pellegrin/set/core/p_queue_fast.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_QUEUE_FAST_HH -# define MLN_CORE_P_QUEUE_FAST_HH +#ifndef MLN_CORE_SITE_SET_P_QUEUE_FAST_HH +# define MLN_CORE_SITE_SET_P_QUEUE_FAST_HH -/*! \file mln/core/p_queue_fast.hh +/*! \file mln/core/site_set/p_queue_fast.hh * * \brief Definition of a point set class faster but needs more memory * space. @@ -315,4 +315,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_P_QUEUE_FAST_HH +#endif // ! MLN_CORE_SITE_SET_P_QUEUE_FAST_HH Index: sandbox/aroumougame/skeleton/miscellenous.hh --- sandbox/aroumougame/skeleton/miscellenous.hh (revision 2170) +++ sandbox/aroumougame/skeleton/miscellenous.hh (working copy) @@ -1,4 +1,4 @@ -#include <mln/core/p_set.hh> +#include <mln/core/site_set/p_set.hh> #include <mln/core/image2d.hh> #include <mln/value/int_u.hh> #include <vector> Index: sandbox/aroumougame/skeleton/thinning.hh --- sandbox/aroumougame/skeleton/thinning.hh (revision 2170) +++ sandbox/aroumougame/skeleton/thinning.hh (working copy) @@ -1,5 +1,5 @@ #include "neighborhood1.hh" -#include <mln/core/p_set.hh> +#include <mln/core/site_set/p_set.hh> #include <mln/core/graph_image.hh> #include <mln/core/graph_elt_neighborhood.hh> #include <mln/math/min.hh> Index: sandbox/jardonnet/registration/tools.hh --- sandbox/jardonnet/registration/tools.hh (revision 2170) +++ sandbox/jardonnet/registration/tools.hh (working copy) @@ -4,7 +4,7 @@ // temporary # include <mln/algebra/mat.hh> -# include <mln/core/p_array.hh> +# include <mln/core/site_set/p_array.hh> # include "quat7.hh" Index: sandbox/jardonnet/registration/quat7.hh --- sandbox/jardonnet/registration/quat7.hh (revision 2170) +++ sandbox/jardonnet/registration/quat7.hh (working copy) @@ -6,7 +6,7 @@ # include <algorithm> # include <mln/algebra/mat.hh> -# include <mln/core/p_array.hh> +# include <mln/core/site_set/p_array.hh> # include "rotation.hh" # include "jacobi.hh" Index: sandbox/jardonnet/registration/cloud.hh --- sandbox/jardonnet/registration/cloud.hh (revision 2170) +++ sandbox/jardonnet/registration/cloud.hh (working copy) @@ -8,7 +8,7 @@ # include <sstream> # include <mln/algebra/vec.hh> -# include <mln/core/p_array.hh> +# include <mln/core/site_set/p_array.hh> # include <mln/norm/l2.hh> #include "quat7.hh" Index: sandbox/geraud/fllt/fllt.hh --- sandbox/geraud/fllt/fllt.hh (revision 2170) +++ sandbox/geraud/fllt/fllt.hh (working copy) @@ -30,11 +30,11 @@ #include <mln/core/image2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/p_array.hh> +#include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> #include <mln/core/sub_image.hh> -#include <mln/core/p_queue_fast.hh> +#include <mln/core/site_set/p_queue_fast.hh> #include <mln/core/cast_image.hh> #include <mln/value/int_u8.hh> Index: sandbox/geraud/fllt/fllt.svg.1.cc --- sandbox/geraud/fllt/fllt.svg.1.cc (revision 2170) +++ sandbox/geraud/fllt/fllt.svg.1.cc (working copy) @@ -27,7 +27,7 @@ #include <mln/core/image2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/p_array.hh> +#include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/value/int_u8.hh> Index: sandbox/geraud/fllt/fllt.svg.7.hh --- sandbox/geraud/fllt/fllt.svg.7.hh (revision 2170) +++ sandbox/geraud/fllt/fllt.svg.7.hh (working copy) @@ -33,11 +33,11 @@ #include <mln/core/image2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/p_array.hh> +#include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> #include <mln/core/sub_image.hh> -#include <mln/core/p_queue_fast.hh> +#include <mln/core/site_set/p_queue_fast.hh> #include <mln/core/cast_image.hh> #include <mln/value/int_u8.hh> Index: sandbox/geraud/fllt/fllt.svg.2.cc --- sandbox/geraud/fllt/fllt.svg.2.cc (revision 2170) +++ sandbox/geraud/fllt/fllt.svg.2.cc (working copy) @@ -27,7 +27,7 @@ #include <mln/core/image2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/p_array.hh> +#include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> Index: sandbox/geraud/fllt/fllt.svg.3.cc --- sandbox/geraud/fllt/fllt.svg.3.cc (revision 2170) +++ sandbox/geraud/fllt/fllt.svg.3.cc (working copy) @@ -27,7 +27,7 @@ #include <mln/core/image2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/p_array.hh> +#include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> #include <mln/core/sub_image.hh> Index: sandbox/geraud/fllt/fllt.svg.4.cc --- sandbox/geraud/fllt/fllt.svg.4.cc (revision 2170) +++ sandbox/geraud/fllt/fllt.svg.4.cc (working copy) @@ -27,7 +27,7 @@ #include <mln/core/image2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/p_array.hh> +#include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> #include <mln/core/sub_image.hh> Index: sandbox/geraud/fllt/fllt.svg.5.cc --- sandbox/geraud/fllt/fllt.svg.5.cc (revision 2170) +++ sandbox/geraud/fllt/fllt.svg.5.cc (working copy) @@ -27,7 +27,7 @@ #include <mln/core/image2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/p_array.hh> +#include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> #include <mln/core/sub_image.hh> Index: sandbox/geraud/fllt/fllt.svg.6.cc --- sandbox/geraud/fllt/fllt.svg.6.cc (revision 2170) +++ sandbox/geraud/fllt/fllt.svg.6.cc (working copy) @@ -29,11 +29,11 @@ #include <mln/core/image2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/p_array.hh> +#include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> #include <mln/core/sub_image.hh> -#include <mln/core/p_queue_fast.hh> +#include <mln/core/site_set/p_queue_fast.hh> #include <mln/core/cast_image.hh> #include <mln/value/int_u8.hh> Index: sandbox/geraud/fllt/fllt_test.hh --- sandbox/geraud/fllt/fllt_test.hh (revision 2170) +++ sandbox/geraud/fllt/fllt_test.hh (working copy) @@ -29,11 +29,11 @@ #include <mln/core/image2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/p_array.hh> +#include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> #include <mln/core/sub_image.hh> -#include <mln/core/p_queue_fast.hh> +#include <mln/core/site_set/p_queue_fast.hh> #include <mln/core/cast_image.hh> #include <mln/value/int_u8.hh> Index: sandbox/geraud/fllt.svg.7.hh --- sandbox/geraud/fllt.svg.7.hh (revision 2170) +++ sandbox/geraud/fllt.svg.7.hh (working copy) @@ -33,11 +33,11 @@ #include <mln/core/image2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/p_array.hh> +#include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> #include <mln/core/sub_image.hh> -#include <mln/core/p_queue_fast.hh> +#include <mln/core/site_set/p_queue_fast.hh> #include <mln/core/cast_image.hh> #include <mln/value/int_u8.hh> Index: sandbox/geraud/p_runs__with_dedicated_piter.hh --- sandbox/geraud/p_runs__with_dedicated_piter.hh (revision 2170) +++ sandbox/geraud/p_runs__with_dedicated_piter.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_RUNS_HH -# define MLN_CORE_P_RUNS_HH +#ifndef MLN_CORE_SITE_SET_P_RUNS_HH +# define MLN_CORE_SITE_SET_P_RUNS_HH /*! \file mln/core/p_runs.hh * @@ -34,7 +34,7 @@ */ # include <mln/accu/bbox.hh> -# include <mln/core/p_run.hh> +# include <mln/core/site_set/p_run.hh> # include <mln/core/p_double.hh> # include <mln/core/internal/piter_adaptor.hh> # include <mln/util/set.hh> @@ -755,4 +755,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_P_RUNS_HH +#endif // ! MLN_CORE_SITE_SET_P_RUNS_HH Index: sandbox/geraud/fllt.svg.6.cc --- sandbox/geraud/fllt.svg.6.cc (revision 2170) +++ sandbox/geraud/fllt.svg.6.cc (working copy) @@ -29,11 +29,11 @@ #include <mln/core/image2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/p_array.hh> +#include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> #include <mln/core/sub_image.hh> -#include <mln/core/p_queue_fast.hh> +#include <mln/core/site_set/p_queue_fast.hh> #include <mln/core/cast_image.hh> #include <mln/value/int_u8.hh> Index: sandbox/geraud/cs2d/cs2d_morpho.hh --- sandbox/geraud/cs2d/cs2d_morpho.hh (revision 2170) +++ sandbox/geraud/cs2d/cs2d_morpho.hh (working copy) @@ -2,7 +2,7 @@ # include <mln/accu/min_max.hh> # include <mln/labeling/regional_minima.hh> -# include <mln/core/p_queue_fast.hh> +# include <mln/core/site_set/p_queue_fast.hh> namespace mln Index: sandbox/garrigues/level_set.hh --- sandbox/garrigues/level_set.hh (revision 2170) +++ sandbox/garrigues/level_set.hh (working copy) @@ -42,12 +42,12 @@ # include <mln/core/image2d.hh> # include <mln/core/point2d.hh> -# include <mln/core/p_set.hh> +# include <mln/core/site_set/p_set.hh> # include <mln/core/inplace.hh> # include <mln/core/neighb2d.hh> # include <mln/core/clock_neighb2d.hh> # include <mln/core/pset_if_piter.hh> -# include <mln/core/pset_if.hh> +# include <mln/core/site_set/pset_if.hh> # include <mln/core/sub_image.hh> # include <mln/core/image_if.hh> # include <mln/core/clone.hh> Index: sandbox/garrigues/fllt/fllt_simple.svg.1.cc --- sandbox/garrigues/fllt/fllt_simple.svg.1.cc (revision 2170) +++ sandbox/garrigues/fllt/fllt_simple.svg.1.cc (working copy) @@ -32,7 +32,7 @@ #include <mln/core/image2d.hh> #include <mln/core/sub_image.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/p_array.hh> +#include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/value/int_u8.hh> Index: sandbox/garrigues/fllt/fllt_simple.svg.3.cc --- sandbox/garrigues/fllt/fllt_simple.svg.3.cc (revision 2170) +++ sandbox/garrigues/fllt/fllt_simple.svg.3.cc (working copy) @@ -32,7 +32,7 @@ #include <mln/core/image2d.hh> #include <mln/core/sub_image.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/p_array.hh> +#include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/value/int_u8.hh> @@ -52,7 +52,7 @@ #include <mln/util/branch_iter_ind.hh> #include <mln/core/cast_image.hh> -#include <mln/core/p_queue_fast.hh> +#include <mln/core/site_set/p_queue_fast.hh> namespace mln { Index: sandbox/garrigues/fllt/fllt_simple.cc --- sandbox/garrigues/fllt/fllt_simple.cc (revision 2170) +++ sandbox/garrigues/fllt/fllt_simple.cc (working copy) @@ -32,11 +32,11 @@ #include <mln/core/image2d.hh> #include <mln/core/sub_image.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/p_array.hh> +#include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/cast_image.hh> -#include <mln/core/p_queue_fast.hh> +#include <mln/core/site_set/p_queue_fast.hh> #include <mln/core/dp_array.hh> Index: sandbox/garrigues/fllt/types.hh --- sandbox/garrigues/fllt/types.hh (revision 2170) +++ sandbox/garrigues/fllt/types.hh (working copy) @@ -35,7 +35,7 @@ * */ -# include <mln/core/p_set.hh> +# include <mln/core/site_set/p_set.hh> # include <mln/util/tree.hh> # include <mln/util/branch_iter_ind.hh> Index: sandbox/garrigues/fllt/fllt_theo.cc --- sandbox/garrigues/fllt/fllt_theo.cc (revision 2170) +++ sandbox/garrigues/fllt/fllt_theo.cc (working copy) @@ -31,7 +31,7 @@ #include <mln/core/image2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/p_array.hh> +#include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/value/int_u8.hh> Index: sandbox/garrigues/fllt/fllt_types.hh --- sandbox/garrigues/fllt/fllt_types.hh (revision 2170) +++ sandbox/garrigues/fllt/fllt_types.hh (working copy) @@ -36,7 +36,7 @@ */ # include <mln/util/tree.hh> -# include <mln/core/p_set.hh> +# include <mln/core/site_set/p_set.hh> # define fllt_tree(P, V) util::tree< mln::fllt::fllt_node_elt<P, V> > # define fllt_node(P, V) util::node< mln::fllt::fllt_node_elt<P, V> > Index: sandbox/garrigues/fllt/fllt_simple.svg.2.cc --- sandbox/garrigues/fllt/fllt_simple.svg.2.cc (revision 2170) +++ sandbox/garrigues/fllt/fllt_simple.svg.2.cc (working copy) @@ -32,7 +32,7 @@ #include <mln/core/image2d.hh> #include <mln/core/sub_image.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/p_array.hh> +#include <mln/core/site_set/p_array.hh> #include <mln/core/clone.hh> #include <mln/value/int_u8.hh> Index: sandbox/garrigues/fllt/fllt.hh --- sandbox/garrigues/fllt/fllt.hh (revision 2170) +++ sandbox/garrigues/fllt/fllt.hh (working copy) @@ -36,11 +36,11 @@ */ # include <mln/core/image2d.hh> -# include <mln/core/p_set.hh> +# include <mln/core/site_set/p_set.hh> # include <mln/core/inplace.hh> # include <mln/core/neighb2d.hh> # include <mln/core/pset_if_piter.hh> -# include <mln/core/pset_if.hh> +# include <mln/core/site_set/pset_if.hh> # include <mln/core/sub_image.hh> # include <mln/core/image_if.hh> # include <mln/core/clone.hh> Index: sandbox/garrigues/fllt/give_confs.cc --- sandbox/garrigues/fllt/give_confs.cc (revision 2170) +++ sandbox/garrigues/fllt/give_confs.cc (working copy) @@ -1,6 +1,6 @@ #include <mln/core/image2d.hh> #include <mln/core/point2d.hh> -#include <mln/core/p_set.hh> +#include <mln/core/site_set/p_set.hh> #include <mln/core/clock_neighb2d.hh> #include <mln/core/neighb2d.hh> Index: sandbox/abraham/tests/morpho/test_component_tree.cc --- sandbox/abraham/tests/morpho/test_component_tree.cc (revision 2170) +++ sandbox/abraham/tests/morpho/test_component_tree.cc (working copy) @@ -1,7 +1,7 @@ #include <mln/core/image2d.hh> #include <mln/core/window2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/p_set.hh> +#include <mln/core/site_set/p_set.hh> #include <mln/value/int_u8.hh> Index: sandbox/abraham/tests/morpho/test_watershed.cc --- sandbox/abraham/tests/morpho/test_watershed.cc (revision 2170) +++ sandbox/abraham/tests/morpho/test_watershed.cc (working copy) @@ -1,7 +1,7 @@ #include <mln/core/image2d.hh> #include <mln/core/window2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/p_set.hh> +#include <mln/core/site_set/p_set.hh> #include <mln/value/int_u8.hh> #include <mln/level/compare.hh> #include <mln/io/pgm/load.hh> Index: sandbox/abraham/tests/morpho/test_watershed_topo.cc --- sandbox/abraham/tests/morpho/test_watershed_topo.cc (revision 2170) +++ sandbox/abraham/tests/morpho/test_watershed_topo.cc (working copy) @@ -1,7 +1,7 @@ #include <mln/core/image2d.hh> #include <mln/core/window2d.hh> #include <mln/core/neighb2d.hh> -#include <mln/core/p_set.hh> +#include <mln/core/site_set/p_set.hh> #include <mln/value/int_u8.hh> #include <mln/level/compare.hh> Index: sandbox/abraham/mln/morpho/basic_najman.hh --- sandbox/abraham/mln/morpho/basic_najman.hh (revision 2170) +++ sandbox/abraham/mln/morpho/basic_najman.hh (working copy) @@ -1,7 +1,7 @@ #include <mln/level/sort_psites.hh> #include <mln/level/fill.hh> #include <mln/core/image2d.hh> -#include <mln/core/p_set.hh> +#include <mln/core/site_set/p_set.hh> #include <mln/util/greater_psite.hh> #include <mln/estim/min_max.hh> #include <mln/math/sqr.hh>