1. 19 Nov, 2008 20 commits
  2. 18 Nov, 2008 11 commits
  3. 17 Nov, 2008 5 commits
    • Thierry Geraud's avatar
      Rename some graph-related files and classes. · 26503c7e
      Thierry Geraud authored
      	* mln/util/internal/graph_edge.hh: Rename as...
      	* mln/util/edge.hh: ...this.
      	* mln/util/internal/graph_vertex.hh: Rename as...
      	* mln/util/vertex.hh: ...this.
      	* mln/util/all.hh: Update.
      
      	* mln/util/internal/graph_psite_base.hh: Rename as...
      	* mln/core/internal/graph_psite_base.hh: ...this.
      
      	* mln/util/internal/graph_vertex_psite.hh: Rename as...
      	* mln/core/site_set/p_vertices_psite.hh: ...this.
      	(internal::graph_vertex_psite): Rename as...
      	(p_vertices_psite): ...this.
      	* mln/util/internal/graph_edge_psite.hh: Rename as...
      	* mln/core/site_set/p_edges_psite.hh: ...this.
      	(internal::graph_edge_psite): Rename as...
      	(p_edges_psite): ...this.
      
      	* mln/util/internal/graph_iter.hh,
      	* mln/util/internal/graph_base.hh,
      	* mln/util/internal/graph_iter_base.hh,
      	* mln/core/site_set/p_vertices.hh,
      	* mln/core/site_set/p_edges.hh,
      	* mln/core/image/line_graph_neighborhood_piter.hh,
      	* mln/core/image/line_graph_window_piter.hh,
      	* mln/core/image/line_graph_elt_window.hh,
      	* mln/core/image/line_graph_elt_neighborhood.hh,
      	* mln/core/image/graph_window_piter.hh,
      	* mln/core/image/graph_neighborhood_piter.hh,
      	* mln/core/image/graph_elt_neighborhood.hh,
      	* mln/core/image/graph_elt_window.hh: Update.
      
      
      git-svn-id: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008@2889 4aad255d-cdde-0310-9447-f3009e2ae8c0
      26503c7e
    • Thierry Geraud's avatar
      Some fixes in graph-related materials. · 6f75ce31
      Thierry Geraud authored
      	* tests/core/site_set/p_vertices.cc: Layout.
      	(UINT_MAX): Fix warning; use mln_max(unsigned).
      	* tests/core/site_set/p_edges.cc: Likewise.
      	* mln/core/site_set/p_vertices.hh (graph_t): (Re-)New.
      	* mln/core/site_set/p_edges.hh: .
      	It is used so it is featured!
      	* mln/algebra/vec.hh: Upgrade doc style.
      	(operator/): Fix warning with g++-4.3.
      	* mln/util/internal/graph_edge.hh (graph): Fix return sig.
      	* mln/util/internal/graph_vertex.hh: Likewise.
      	* mln/util/internal/graph_edge_psite.hh: Layout.
      	(e): Fix missing update; inherited attr is elt_.
      	* mln/util/internal/graph_vertex_psite.hh: Likewise.
      	* mln/util/internal/graph_psite_base.hh: Layout.
      	(super): Remove; unused.
      	Layout.
      
      
      git-svn-id: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008@2888 4aad255d-cdde-0310-9447-f3009e2ae8c0
      6f75ce31
    • Thierry Geraud's avatar
      Cleanup basic graph class and related materials. · bfc1b12f
      Thierry Geraud authored
      	* mln/core/site_set/p_graph_piter.hh: Upgrade doc style.
      	(operator<<): Remove; useless.
      	* mln/core/site_set/p_vertices.hh
      	(vertex, graph_element): New typedefs.
      	(graph_t): Remove; use explicitly G instead.
      	* mln/core/site_set/p_edges.hh
      	(edge, graph_element): New typedefs.
      	(graph_t): Remove; use explicitly G instead.
      	* mln/util/graph.hh: Layout.
      	* mln/util/internal/graph_base.hh (graph_id): Fix return type.
      	That avoids a warning at compile-time.
      	* mln/core/concept/graph.hh: Update.
      	* mln/util/internal/graph_iter.hh: Layout.
      	* mln/util/internal/graph_edge.hh: Upgrade doc style.
      	(operator<<): Fix missing const.
      	(edge::edge): Prefer invalidate over id_ set to 0.
      	(FIXME): New.
      	(invalidate): Set id_ to unsigned max value; less error-prone.
      	(graph_t): Use instead explicit...
      	(G): ...parameter type.
      	* mln/util/internal/graph_edge_psite.hh: Upgrade doc style.
      	(target_t, edge_t): Use instead the explicit...
      	(p_edges, util::edge): ...types.
      	* mln/util/internal/graph_vertex.hh
      	(vertex::vertex): Prefer invalidate over id_ set to 0.
      	(FIXME): New.
      	(invalidate): Set id_ to unsigned max value; less error-prone.
      	(graph_t): Use instead explicit...
      	(G): ...parameter type.
      	Fix doc.
      	* mln/util/internal/graph_psite_base.hh: Fix doc.
      	(V, P): Remove these useless parameters, now deduce from S.
      	(v_): Rename this attribute as...
      	(elt_): ...this; more explicit name.
      	(target): Prefer to use the explicit...
      	(S): ...type.
      	(t_): Rename as...
      	(s_): ...this; consistent with other classes.
      	(q_subject): Remove; obsolete.
      	(to_site): Remove; inherited.
      	(operator<<): Remove; useless.
      	(operator graph_element): New conversion operator.
      	(site_set, graph, subj_): Fix missing precondition.
      	* mln/util/internal/graph_vertex_psite.hh: Fix doc.
      	(target_t, vertex_t): Prefer to use explicit...
      	(p_vertices, util::vertex): ...types.
      	* mln/util/internal/graph_iter_base.hh
      	(P): Rename this parameter as...
      	(Elt): ...this; more explicit.
      	(invalidate): Fix missing postcondition.
      	(next): Fix missing precondition.
      
      
      git-svn-id: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008@2887 4aad255d-cdde-0310-9447-f3009e2ae8c0
      bfc1b12f
    • Thierry Geraud's avatar
      Use unmeta and handle accu object when needed. · 054c1ebb
      Thierry Geraud authored
      	* mln/level/compute.hh,
      	* mln/accu/compute.hh,
      	* mln/morpho/elementary/like_ero_fun.hh,
      	* mln/labeling/compute.hh: Use unmeta.
      
      	* mln/accu/transform_directional.hh,
      	* mln/accu/transform_diagonal.hh,
      	* mln/accu/transform_snake.hh: Handle the accu object.
      	(FIXME): Remove.
      	
      	* mln/accu/transform_stop.hh: Layout.
      
      
      git-svn-id: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008@2886 4aad255d-cdde-0310-9447-f3009e2ae8c0
      054c1ebb
    • Guillaume Lazzara's avatar
      Introduce a dual graph class. · 10cae422
      Guillaume Lazzara authored
      	* mln/core/concept/graph.hh: does not force add_* methods.
      
      	* mln/util/dual_graph.hh: new class.
      
      	* mln/util/graph.hh: cleanup comments
      
      	* mln/util/internal/graph_edge.hh: add missing operator<<.
      
      	* mln/util/internal/graph_nbh_iter_base.hh,
      	* mln/util/internal/graph_iter_base.hh: add operator unsigned().
      
      	* tests/util/Makefile.am,
      	* tests/util/dual_graph.cc: Add a new test.
      
      git-svn-id: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008@2885 4aad255d-cdde-0310-9447-f3009e2ae8c0
      10cae422
  4. 15 Nov, 2008 1 commit
  5. 14 Nov, 2008 3 commits
    • Thierry Geraud's avatar
      Factor code for erosion on lines. · ef67f3c8
      Thierry Geraud authored
      	* mln/accu/transform_directional.hh (include): Layout.
      	(output): Fix typedef.
      	* mln/accu/transform_diagonal.hh: Likewise.
      	Fix declaration signature.
      	* tests/accu/transform_directional.cc: New.
      	* tests/accu/transform_diagonal.cc: New.
      	* mln/accu/all.hh: Update.
      	* mln/morpho/erosion.spe.hh
      	(erosion_dispatch_wrt_win): Handle the case win.size == 1.
      	Remove useless qualif morpho::.
      	(erosion_dispatch_wrt_win): Factor code for hline2d and vline2d
      	into...
      	(erosion_dispatch_line): ...this new overloaded routine.
      	(erosion_dispatch_diagonal): Remove check on kind::logic cause it
      	also works on this case. 
      	
      	To be consistent:
      	* mln/accu/snake_2d.hh: Rename as...
      	* mln/accu/transform_snake.hh: ...this.
      	* mln/morpho/erosion.spe.hh (erosion_arbitrary_2d): Update.
      	* mln/morpho/includes.hh: Update.
      	* tests/accu/snake_2d.cc: Rename as...
      	* tests/accu/transform_snake.cc: ...this.
      	* tests/accu/Makefile.am: Update.
      
      
      git-svn-id: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008@2883 4aad255d-cdde-0310-9447-f3009e2ae8c0
      ef67f3c8
    • Thierry Geraud's avatar
      Move diagonal-related code out of erosion, then factor. · e3ada59c
      Thierry Geraud authored
      	* mln/accu/transform_diagonal.hh: New file.
      	* mln/morpho/erosion.spe.hh
      	(erosion_diagonal2d_functor),
      	(erosion_diagonal2d_fastest_functor),
      	(erosion_backdiagonal2d_functor),
      	(erosion_backdiagonal2d_fastest_functor): Move and rename as...
      	* mln/accu/transform_diagonal.hh
      	(diagonal_functor, diagonal_fastest_functor),
      	(backdiagonal_functor, backdiagonal_fastest_functor): ...these.
      	* mln/morpho/erosion.spe.hh (erosion_diagonal2d): Rename as...
      	(erosion_diagonal_2d): ...this; it is the only impl routine.
      	(erosion_backdiagonal2d),
      	(erosion_diagonal2d_fastest),
      	(erosion_backdiagonal2d_fastest): Remove these impl routines.
      	Thanks to factorization in accu::transform_diagonal, those are
      	now useless.
      	(erosion_dispatch_for_diagonal2d),
      	(erosion_dispatch_for_backdiagonal2d): Factor into...
      	(erosion_dispatch_diagonal): ...this new dispatch routine.
      	Now both diagonals are handled by the same code.
      
      	* mln/morpho/includes.hh: Update.
      	* mln/accu/transform_directional.hh
      	(diff): Remove useless include.
      	* mln/win/line.hh: Upgrade doc style.
      	(dir): New constant.
      
      
      git-svn-id: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008@2882 4aad255d-cdde-0310-9447-f3009e2ae8c0
      e3ada59c
    • Guillaume Lazzara's avatar
      Update graph related classes. · 344a314f
      Guillaume Lazzara authored
      	* mln/core/internal/graph_neighborhood_base.hh,
      	* mln/core/image/graph_elt_neighborhood.hh,
      	* mln/core/image/line_graph_elt_neighborhood.hh,
      	* mln/core/internal/graph_window_base.hh,
      	* mln/core/image/graph_elt_window.hh,
      	* mln/core/image/line_graph_elt_window.hh: refactor.
      
      	* mln/make/voronoi.hh,
      	* mln/core/internal/line_graph_vicinity_piter.hh,
      	* mln/core/image/line_graph_window_piter.hh,
      	* mln/core/image/line_graph_neighborhood_piter.hh: update according
      	the new graph structure.
      
      	* mln/core/site_set/p_graph.hh,
      	* mln/core/site_set/p_line_graph.hh,
      	* mln/core/site_set/p_line_graph_piter.hh,
      	* mln/core/image/line_graph_psite.hh: deprecated and deleted.
      
      	* tests/core/site_set/p_vertices.cc,
      	* mln/util/graph.hh,
      	* mln/util/internal/graph_vertex_impl.hh,
      	* mln/util/internal/graph_edge_impl.hh: fix comments.
      
      	* mln/util/internal/graph_edge_psite.hh: fix initialization.
      
      	* tests/core/site_set/p_edges.cc,
      	* tests/core/image/graph_image.cc,
      	* tests/core/image/line_graph_image.cc: fix tests.
      
              * mln/make/all.hh
      	* mln/make/essential.hh: uncomment inclusion of voronoi.hh.
      
      git-svn-id: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008@2881 4aad255d-cdde-0310-9447-f3009e2ae8c0
      344a314f