1. 29 Apr, 2009 5 commits
    • Thierry Geraud's avatar
      Turn take_as_init as a 'template method' pattern. · 393d0fc1
      Thierry Geraud authored
      	* mln/core/concept/accumulator.hh
      	(take_as_init): Rename as...
      	(take_as_init_): ...this.  This is default implementation.
      	(take_as_init): New.  Dispatch to take_as_init_.
      	Now, we have the "template method" method pattern.  It is
      	cleaner since we do not have any overriding for the
      	client-side method.
      	(take_n_times, take_n_times_): New.
      	
      	* mln/accu/nil.hh,
      	* mln/accu/tuple.hh,
      	* mln/accu/pair.hh,
      	* mln/accu/lor.hh,
      	* mln/accu/sum.hh,
      	* mln/accu/inf.hh,
      	* mln/accu/land_basic.hh,
      	* mln/accu/min.hh,
      	* mln/accu/max.hh,
      	* mln/accu/bbox.hh,
      	* mln/accu/min_h.hh,
      	* mln/accu/max_h.hh,
      	* mln/accu/lor_basic.hh,
      	* mln/accu/p.hh,
      	* mln/accu/rms.hh,
      	* mln/accu/rank_high_quant.hh,
      	* mln/accu/v.hh,
      	* mln/accu/rank_bool.hh,
      	* mln/accu/sup.hh,
      	* mln/accu/land.hh,
      	* mln/morpho/attribute/sum.hh,
      	* mln/morpho/attribute/count_adjacent_vertices.hh,
      	* mln/morpho/attribute/sharpness.hh,
      	* mln/morpho/attribute/volume.hh,
      	* mln/morpho/attribute/height.hh,
      	* mln/morpho/attribute/card.hh (take_as_init): Update.
      	Rename as...
      	(take_as_init_): ...this overriding name.
      	
      	* tests/accu/count.cc: Update.
      
      
      git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@3727 4aad255d-cdde-0310-9447-f3009e2ae8c0
      393d0fc1
    • Thierry Geraud's avatar
      Start cleaning up linear gaussian filters. · 9a765fde
      Thierry Geraud authored
      	* mln/linear/gaussian: New directory.
      	* mln/linear/gaussian/internal: New directory.
      	* mln/linear/gaussian.hh: Split code into...
      	* mln/linear/gaussian/impl.hh,
      	* mln/linear/gaussian/filter.hh,
      	* mln/linear/gaussian/internal/coefficients.hh:
      	...those new files.
      	
      	* tests/linear/gaussian: New directory.
      	* tests/linear/Makefile.am: Update.
      	* tests/linear/gaussian/Makefile.am: New.
      	* tests/linear/gaussian/filter.cc: New.
      
      	Misc.
      	
      	* mln/labeling/compute.hh: .
      	* mln/labeling/pack.hh (relabel_inplace): Fix missing
      	renaming into...
      	(pack_inplace): ...this.
      
      
      git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@3726 4aad255d-cdde-0310-9447-f3009e2ae8c0
      9a765fde
    • Étienne Folio's avatar
      Histograms update. · 5c15355e
      Étienne Folio authored
      	* folio/mln/histo/compute_histo.hh: Some brainstorming.
      	* folio/mln/histo/compute_histo_3d.hh: Some corrections from compute_histo.
      
      git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@3725 4aad255d-cdde-0310-9447-f3009e2ae8c0
      5c15355e
    • Thierry Geraud's avatar
      New shell script dedicated to fast word segmentation. · a7c021c5
      Thierry Geraud authored
      	* icdar/2009/hsc/first_attempts/words_25p.sh: New.
      	This version works on images reduced by 25%.
      	* icdar/2009/hsc/ws_to_wsl.hh: Add log.
      
      
      git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@3724 4aad255d-cdde-0310-9447-f3009e2ae8c0
      a7c021c5
    • Étienne Folio's avatar
      HSV type. · d4f05e00
      Étienne Folio authored
      	* folio/mln/fun/v2v/rgb_to_hsv.hh: New conversions.
      	* folio/mln/fun/v2v: New folder.
      	* folio/mln/fun: New folder.
      	* folio/mln/value/circular.hh: Comment a part of unused code.
      	* folio/mln/value/hsv.hh: New HSV type.
      	* folio/test/value/hsv.cc: New tests file for HSV type.
      
      git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@3723 4aad255d-cdde-0310-9447-f3009e2ae8c0
      d4f05e00
  2. 28 Apr, 2009 6 commits
    • Frdric Bour's avatar
      Correct bugs, point functions. · e83f8bb8
      Frdric Bour authored
      	*  milena/mln/fun/point/col.hh: New.
      	*  milena/mln/fun/point/row.hh: New.
      	*  milena/mln/fun/point/sli.hh: New.
      	*  milena/mln/fun/point: New.
      	*  milena/mln/fun/spe/unary.hh: Improved proxy support.
      	*  milena/mln/fun/unary.hh: Improved proxy support.
      	*  milena/mln/trait/next/solve_proxy.hh: Typo errors correction.
      	*  milena/sandbox/fred/tests/fun.cc,
      	*  milena/sandbox/fred/tests/thru.cc: Add some tests for proxy.
      
      git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@3722 4aad255d-cdde-0310-9447-f3009e2ae8c0
      e83f8bb8
    • Étienne Folio's avatar
      Circular value type. · 73612364
      Étienne Folio authored
      	* folio/mln/value/circular.hh: New type.
      	* folio/test/value/circular.cc: New tests.
      
      git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@3721 4aad255d-cdde-0310-9447-f3009e2ae8c0
      73612364
    • Fabien Freling's avatar
      Add world/ directory for inter_pixel images. · 09b601c6
      Fabien Freling authored
      	* mln/arith/all.hh: Update.
      	* mln/arith/div.hh: New div operator.
      	* mln/arith/div.spe.hh: New div operator.
      	* mln/io/magick/save.hh: Update.
      	* mln/io/plot/save.hh: Update.
      	* mln/world/inter_pixel/full.hh: Convert standard image
      	  to inter_pixel image.
      	* mln/world/inter_pixel/neighb2d.hh: Define standard
      	  inter_pixel neighborhood.
      
      git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@3720 4aad255d-cdde-0310-9447-f3009e2ae8c0
      09b601c6
    • Fabien Freling's avatar
      Convert Matlab images to Milena images. · d7172d48
      Fabien Freling authored
      	* fabien/igr/mat2mln/mat2mln.cc: Convert matlab ascii format
      	  to mln format.
      	* fabien/igr/mat2mln/raw2mlndata.cc: Deprecated.
      	* fabien/igr/seg_fixed.cc: Update.
      
      git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@3719 4aad255d-cdde-0310-9447-f3009e2ae8c0
      d7172d48
    • Guillaume Lazzara's avatar
      Fix ambiguities while loading PGM images into label values. · e88137ed
      Guillaume Lazzara authored
      	* mln/io/pnm/load.hh: Use the value equivalent type to read
      	data correctly.
      
      git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@3718 4aad255d-cdde-0310-9447-f3009e2ae8c0
      e88137ed
    • Guillaume Lazzara's avatar
      Small fixes (again). · 35db73ac
      Guillaume Lazzara authored
      	* headers.mk: update distributed file list.
      
      	* mln/accu/inf.hh,
      	* mln/accu/sup.hh: add a missing typename.
      
      	* mln/canvas/browsing/depth_first_search.hh: call id() on vertex
      	elements.
      
      	* mln/core/concept/object_id.hh: add a missing operator==.
      
      	* mln/fun/math/inf.hh,
      	* mln/fun/math/sup.hh: add a missing new line at end of file and fix
      	copyright.
      
      	* mln/trait/next/solve_proxy.hh: add a missing forward declaration.
      
      	* mln/util/vertex.hh,
      	* mln/util/internal/id2element.hh: add a missing include.
      
      	* tests/core/image/line_graph_image.cc: use make::vertex_image.
      
      	* tests/make/dummy_p_edges.cc,
      	* tests/make/dummy_p_vertices.cc,
      	* tests/util/line_graph.cc: call index() instead of id().
      
      	* tests/unit_test/unit-tests.mk: update list of unit tests.
      
      git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@3717 4aad255d-cdde-0310-9447-f3009e2ae8c0
      35db73ac
  3. 27 Apr, 2009 7 commits
    • Frdric Bour's avatar
      Merge new fun implementation to main milena directory. · 9a1e2e03
      Frdric Bour authored
      	*  milena/mln/accu/inf.hh: New.
      	*  milena/mln/accu/sup.hh: New.
      	*  milena/mln/core/concept/meta_function.hh: New.
      	*  milena/mln/core/image/thru_morpher.hh: New.
      	*  milena/mln/core/image/thrubin_morpher.hh: New.
      	*  milena/mln/fun/accu_result.hh: New.
      	*  milena/mln/fun/binary.hh: New.
      	*  milena/mln/fun/component/blue.hh: New.
      	*  milena/mln/fun/component/comp.hh: New.
      	*  milena/mln/fun/component/green.hh: New.
      	*  milena/mln/fun/component/red.hh: New.
      	*  milena/mln/fun/component/rgb.hh: New.
      	*  milena/mln/fun/component: New.
      	*  milena/mln/fun/compose.hh: New.
      	*  milena/mln/fun/composition.hh: New.
      	*  milena/mln/fun/from_accu.hh: New.
      	*  milena/mln/fun/math/abs.hh: New.
      	*  milena/mln/fun/math/cos.hh: New.
      	*  milena/mln/fun/math/inf.hh: New.
      	*  milena/mln/fun/math/norm.hh: New.
      	*  milena/mln/fun/math/sup.hh: New.
      	*  milena/mln/fun/math: New.
      	*  milena/mln/fun/param.hh: New.
      	*  milena/mln/fun/spe/binary.hh: New.
      	*  milena/mln/fun/spe/unary.hh: New.
      	*  milena/mln/fun/spe: New.
      	*  milena/mln/fun/unary.hh: New.
      	*  milena/mln/trait/fun.hh: New.
      	*  milena/mln/trait/next/solve.hh: New.
      	*  milena/mln/trait/next/solve_binary.hh: New.
      	*  milena/mln/trait/next/solve_proxy.hh: New.
      	*  milena/mln/trait/next/solve_unary.hh: New.
      	*  milena/mln/trait/next: New.
      	*  milena/sandbox/fred/mln/accu/inf.hh: Remove.
      	*  milena/sandbox/fred/mln/accu/sup.hh: Remove.
      	*  milena/sandbox/fred/mln/core/concept/meta_function.hh: Remove.
      	*  milena/sandbox/fred/mln/core/image/thru_morpher.hh: Remove.
      	*  milena/sandbox/fred/mln/core/image/thrubin_morpher.hh: Remove.
      	*  milena/sandbox/fred/mln/fun/accu_result.hh: Remove.
      	*  milena/sandbox/fred/mln/fun/binary.hh: Remove.
      	*  milena/sandbox/fred/mln/fun/component/blue.hh: Remove.
      	*  milena/sandbox/fred/mln/fun/component/comp.hh: Remove.
      	*  milena/sandbox/fred/mln/fun/component/green.hh: Remove.
      	*  milena/sandbox/fred/mln/fun/component/red.hh: Remove.
      	*  milena/sandbox/fred/mln/fun/component/rgb.hh: Remove.
      	*  milena/sandbox/fred/mln/fun/compose.hh: Remove.
      	*  milena/sandbox/fred/mln/fun/composition.hh: Remove.
      	*  milena/sandbox/fred/mln/fun/from_accu.hh: Remove.
      	*  milena/sandbox/fred/mln/fun/math/abs.hh: Remove.
      	*  milena/sandbox/fred/mln/fun/math/cos.hh: Remove.
      	*  milena/sandbox/fred/mln/fun/math/inf.hh: Remove.
      	*  milena/sandbox/fred/mln/fun/math/norm.hh: Remove.
      	*  milena/sandbox/fred/mln/fun/math/sup.hh: Remove.
      	*  milena/sandbox/fred/mln/fun/param.hh: Remove.
      	*  milena/sandbox/fred/mln/fun/spe/binary.hh: Remove.
      	*  milena/sandbox/fred/mln/fun/spe/unary.hh: Remove.
      	*  milena/sandbox/fred/mln/fun/unary.hh: Remove.
      	*  milena/sandbox/fred/mln/trait/fun.hh: Remove.
      	*  milena/sandbox/fred/mln/trait/next/solve.hh: Remove.
      	*  milena/sandbox/fred/mln/trait/next/solve_binary.hh: Remove.
      	*  milena/sandbox/fred/mln/trait/next/solve_proxy.hh: Remove.
      	*  milena/sandbox/fred/mln/trait/next/solve_unary.hh: Remove.
      
      git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@3716 4aad255d-cdde-0310-9447-f3009e2ae8c0
      9a1e2e03
    • Frdric Bour's avatar
      Add functions working on components, add proxy support for new. · 6cd4285c
      Frdric Bour authored
      	*  fred/mln/core/image/thrubin_morpher.hh: New.
      	*  fred/mln/fun/component/blue.hh: New.
      	*  fred/mln/fun/component/comp.hh: New.
      	*  fred/mln/fun/component/green.hh: New.
      	*  fred/mln/fun/component/red.hh: New.
      	*  fred/mln/fun/component/rgb.hh: New.
      	*  fred/mln/fun/component: New.
      	*  fred/mln/fun/spe/unary.hh: Debug parameter handling.
      	*  fred/mln/trait/fun.hh: Debug parameter handling.
      	*  fred/mln/trait/next/solve.hh: Add proxy support.
      	*  fred/mln/trait/next/solve_proxy.hh: New.
      	*  fred/tests/cos.cc: Add/remove tests.
      	*  fred/tests/fun.cc: Add/remove tests.
      
      git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@3715 4aad255d-cdde-0310-9447-f3009e2ae8c0
      6cd4285c
    • Guillaume Lazzara's avatar
      Small fixes. · 8ed27da5
      Guillaume Lazzara authored
      	* mln/util/array.hh,
      	* mln/io/pgm/save.hh: remove a wrong precondition.
      
      	* mln/labeling/compute.hh: do not call next() anymore.
      
      	* mln/linear/gaussian_directional_2d.hh: avoid a warning.
      
      	* tests/core/image/safe_image.cc: remove invalid code.
      
      	* tests/level/transform.cc: update invalid code. No implicit
      	conversion allowed from morphers to concrete images.
      
      	* tests/make/Makefile.am: remove duplicate test entry.
      
      	* tests/unit_test/unit-tests.mk: update unit test list.
      
      	* tools/area_flooding.cc: use edge_image and vertex_image.
      
      git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@3714 4aad255d-cdde-0310-9447-f3009e2ae8c0
      8ed27da5
    • Guillaume Lazzara's avatar
      Update the use of graph image in sandbox. · 240eb2d6
      Guillaume Lazzara authored
      	* icdar/2009/dibco/binarization.cc,
      	* icdar/2009/dibco/svg.1.binarization.cc,
      	* icdar/2009/dibco/svg.2.binarization.cc,
      	* icdar/2009/dibco/svg.3.binarization.cc,
      	* lazzara/igr/irm/wst_rag_hsl.cc: use vertex_image and edge_image
      	types.
      
      git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@3713 4aad255d-cdde-0310-9447-f3009e2ae8c0
      240eb2d6
    • Guillaume Lazzara's avatar
      Revamp graph images. · ce4bef1b
      Guillaume Lazzara authored
      	* headers.mk: update distributed file list.
      
      	* mln/make/dummy_p_edges.hh,
      	* mln/make/dummy_p_vertices.hh,
      	* mln/util/line_graph.hh,
      	* mln/util/internal/graph_base.hh,
      	* mln/util/internal/graph_iter.hh,
      	* mln/util/internal/graph_iter_base.hh,
      	* mln/util/internal/graph_nbh_iter.hh,
      	* mln/util/internal/graph_nbh_iter_base.hh,
      	* mln/util/graph.hh,
      	* mln/morpho/attribute/count_adjacent_vertices.hh,
      	* mln/core/concept/graph.hh: update member signatures with vertex and
      	edge ids.
      
      	* mln/core/site_set/p_graph_piter.hh,
      	* mln/core/internal/graph_psite_base.hh,
      	* mln/core/internal/neighb_niter_impl.hh,
      	* mln/core/internal/graph_psite_base.hh,
      	* mln/core/image/graph_window_piter.hh: comment a conversion
      	operators. Cause ambiguities with iterators/proxies.
      
      	* mln/core/image/vertex_image.hh,
      	* mln/core/image/edge_image.hh: add new members.
      
      	* mln/core/internal/site_iterator_base.hh: add a 'target' typedef.
      
      	* mln/core/site_set/p_edges.hh,
      	* mln/core/site_set/p_vertices.hh: add new constructors.
      
      	* mln/make/rag_and_labeled_wsl.hh: update doc.
      
      	* mln/util/graph_ids.hh,
      	* mln/util/edge.hh,
      	* mln/util/vertex.hh: introduce vertex and edge id types.
      
      	* mln/util/internal/id2element.hh: function mapping ids to graph
      	elements.
      
      	* mln/make/p_edges_with_mass_centers.hh: fix guards.
      
      	* tests/make/dummy_p_vertices.cc,
      	* tests/morpho/graph_image_morpho.cc,
      	* tests/morpho/graph_image_wst.cc,
      	* tests/morpho/line_graph_image_morpho.cc,
      	* tests/morpho/line_graph_image_wst.cc,
      	* tests/util/graph.cc,
      	* tests/util/line_graph.cc: update tests according the new
      	routines/constructors/types.
      
      	* mln/core/concept/object_id.hh: new concept for object ids.
      
      git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@3712 4aad255d-cdde-0310-9447-f3009e2ae8c0
      ce4bef1b
    • Guillaume Lazzara's avatar
      Fix documentation distributed files. · cfbbc9b2
      Guillaume Lazzara authored
      	* doc/examples/examples.mk,
      	* doc/figures/figures.mk,
      	* doc/outputs/outputs.mk,
      	* doc/generate_dist_files.sh: do not add distributed files in
      	EXTRA_DIST.
      
      	* doc/examples/samples.mk: remove since useless now.
      
      git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@3711 4aad255d-cdde-0310-9447-f3009e2ae8c0
      cfbbc9b2
    • Guillaume Lazzara's avatar
      Fix seeds2tiling_roundness test. · 7e8dde1b
      Guillaume Lazzara authored
      	* mln/geom/chamfer.hh: Fix a too restrictive test (true == 1 but not >
      	    0).
      
      	* mln/geom/seeds2tiling_roundness.hh: Fix wrong declaration/use of
      	p_priority site_set. Priority was based on sites and not on priority
      	values.
      
      git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@3710 4aad255d-cdde-0310-9447-f3009e2ae8c0
      7e8dde1b
  4. 25 Apr, 2009 4 commits
  5. 24 Apr, 2009 5 commits
  6. 23 Apr, 2009 1 commit
  7. 22 Apr, 2009 2 commits
  8. 21 Apr, 2009 5 commits
  9. 20 Apr, 2009 4 commits
    • Thierry Geraud's avatar
      Update use of transposition. · c322b3b6
      Thierry Geraud authored
      	* icdar/2009/hsc/input_to_lines.hh: Update.
      	* icdar/2009/hsc/input_to_ws.hh: Add log.
      	Update.
      	* icdar/2009/hsc/ws_to_wsl.hh: Likewise.
      	* jardonnet/registration/cov.hh: Update.
      	* jardonnet/registration/quat7.hh: Update.
      
      
      git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@3692 4aad255d-cdde-0310-9447-f3009e2ae8c0
      c322b3b6
    • Thierry Geraud's avatar
      Improve vector and matrix interoperability. · 24623408
      Thierry Geraud authored
      	* mln/algebra/mat.hh (t): New method to transpose; replace...
      	(trans): Remove procedure.
      	(operator*): New overloads to improve interoperatibility
      	between vectors and matrices.
      	* mln/registration/get_rot.hh: Update.
      	* mln/registration/icp.hh: Update.
      	* mln/algebra/vec.hh (mat<n, 1, U>): New conversion op, ctor,
      	and assignment; declarations only, definitions are... 
      	* mln/algebra/mat.hh (mat<n, 1, U>): ...new.
      	* tests/algebra/op_times.cc: New.
      
      	* mln/labeling/compute.hh: Disable check to run on int_u.
      	* mln/accu/sum.hh (take_as_init): New.
      	* mln/accu/image/take_as_init.hh: New overload for image as arg.
      	* tests/accu/image/take_as_init.cc: Augment.
      
      
      git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@3691 4aad255d-cdde-0310-9447-f3009e2ae8c0
      24623408
    • Vincent Ordy's avatar
      Fix configure. · 15231655
      Vincent Ordy authored
      	* configure:
      	Add rules to Makefile.rules without erasing the old file.
      
      git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@3690 4aad255d-cdde-0310-9447-f3009e2ae8c0
      15231655
    • Warren Seine's avatar
      inim: Fix configure. · 3acb1880
      Warren Seine authored
      	* boxes/Makefile: Fix bad include.
      	* boxes/configure: Add test.
      
      git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@3689 4aad255d-cdde-0310-9447-f3009e2ae8c0
      3acb1880
  10. 19 Apr, 2009 1 commit