Commit ee53dffb authored by Thierry Geraud's avatar Thierry Geraud
Browse files

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.


git-svn-id: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008@2171 4aad255d-cdde-0310-9447-f3009e2ae8c0
parent 06835ffc
2008-09-04 Thierry Geraud <thierry.geraud@lrde.epita.fr>
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.
2008-09-03 Nicolas Ballas <ballas@lrde.epita.fr>
 
Fix a compilation bug.
......
# 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>
......
# 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>
......
# 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>
......
# 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>
......
# 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>
......
# 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>
......
# 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.
......
# 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>
......
# 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>
......
# 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>
......
......@@ -34,7 +34,7 @@
*/
# include <mln/accu/internal/base.hh>
# include <mln/core/box.hh>
# include <mln/core/site_set/box.hh>
namespace mln
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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
......
......@@ -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 @@ namespace mln
# include <mln/make/box1d.hh>
#endif // ! MLN_CORE_BOX1D_HH
#endif // ! MLN_CORE_SITE_SET_BOX1D_HH
......@@ -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 @@ namespace mln
# include <mln/make/box2d.hh>
#endif // ! MLN_CORE_BOX2D_HH
#endif // ! MLN_CORE_SITE_SET_BOX2D_HH
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment