1. 20 Jun, 2014 2 commits
    • Roland Levillain's avatar
      Regen files in Milena. · d5d24ad3
      Roland Levillain authored
      	* doc/examples.mk: Regen.
      d5d24ad3
    • Roland Levillain's avatar
      Remove trash/ directories. · 5ea13e37
      Roland Levillain authored
      	* doc/examples/trash/accu.cc,
      	* doc/examples/trash/box.cc,
      	* doc/examples/trash/cpp_issue.cc,
      	* doc/examples/trash/erosion.cc,
      	* doc/examples/trash/for_Z.cc,
      	* doc/examples/trash/graph.cc,
      	* doc/examples/trash/image2d.cc,
      	* doc/examples/trash/image_flat.cc,
      	* doc/examples/trash/image_if.cc,
      	* doc/examples/trash/image_plain.cc,
      	* doc/examples/trash/image_safe.cc,
      	* doc/examples/trash/labeling_algo.cc,
      	* doc/examples/trash/mk_graph.cc,
      	* doc/examples/trash/p_array.2.cc,
      	* doc/examples/trash/p_array.cc,
      	* doc/examples/trash/p_image.cc,
      	* doc/examples/trash/p_key.2.cc,
      	* doc/examples/trash/p_key.cc,
      	* doc/examples/trash/p_line2d.cc,
      	* doc/examples/trash/p_mutable_array_of.cc,
      	* doc/examples/trash/p_queue.cc,
      	* doc/examples/trash/p_run.cc,
      	* doc/examples/trash/p_vaccess.cc,
      	* doc/examples/trash/proxy.cc,
      	* doc/examples/trash/sub_image.cc,
      	* doc/examples/trash/sub_image_if.cc,
      	* doc/examples/trash/tuto_bis.cc,
      	* doc/examples/trash/tuto_one.cc,
      	* doc/examples/trash/vec.cc,
      	* doc/examples/trash/win_multiple.cc,
      	* doc/examples/trash/window.cc,
      	* trash/bgraph_image.cc,
      	* trash/bgraph_image.hh,
      	* trash/bgraph_psite.hh,
      	* trash/boost_graph.cc,
      	* trash/boost_graph.hh,
      	* trash/boost_graph_access.hh,
      	* trash/boost_graph_property.hh,
      	* trash/boost_graph_structure.hh,
      	* trash/clock_neighb.hh,
      	* trash/clock_neighb2d.cc,
      	* trash/clock_neighb2d.hh,
      	* trash/clock_neighb2d_bis.cc,
      	* trash/display_color_pretty.cc,
      	* trash/display_color_pretty.hh,
      	* trash/display_remove.hh,
      	* trash/display_save.hh,
      	* trash/display_save_and_show.hh,
      	* trash/display_show.cc,
      	* trash/display_show.hh,
      	* trash/fi_adaptor.cc,
      	* trash/fi_adaptor.hh,
      	* trash/freeimageplus.mk,
      	* trash/graph_image.hh,
      	* trash/line_graph_image.hh,
      	* trash/mono_obased_rle_encode.hh,
      	* trash/mono_obased_rle_image.cc,
      	* trash/mono_obased_rle_image.hh,
      	* trash/mono_rle_encode.hh,
      	* trash/mono_rle_image.cc,
      	* trash/mono_rle_image.hh,
      	* trash/neighb_get.hh,
      	* trash/neighb_image.cc,
      	* trash/neighb_image.hh,
      	* trash/obased_rle_encode.hh,
      	* trash/obased_rle_image.cc,
      	* trash/obased_rle_image.hh,
      	* trash/p_bgraph.cc,
      	* trash/p_bgraph.hh,
      	* trash/p_bgraph_piter.hh,
      	* trash/rle_encode.hh,
      	* trash/rle_image.cc,
      	* trash/rle_image.hh,
      	* trash/save_and_show.cc,
      	* trash/sparse_encode.hh,
      	* trash/sparse_image.cc,
      	* trash/sparse_image.hh,
      	* trash/t_image.cc,
      	* trash/t_image.hh,
      	* trash/to_tiles.cc,
      	* trash/to_tiles.hh,
      	* trash/translate_image.cc,
      	* trash/translate_image.hh,
      	* trash/value_enc_image.cc,
      	* trash/value_enc_image.hh,
      	* trash/value_encode.hh:
      	Remove.
      	Addresses Trac ticket #280.
      5ea13e37
  2. 19 Jun, 2014 4 commits
    • Roland Levillain's avatar
      AUTHORS: Update and clean up. · f13d23b0
      Roland Levillain authored
      f13d23b0
    • Roland Levillain's avatar
      Do not use mln_VAR in Scribo. · f303e006
      Roland Levillain authored
      	* scribo/debug/text_areas_image.hh,
      	* src/misc/dmap.cc,
      	* src/misc/morpho.cc,
      	* src/misc/rectangularity.cc,
      	* src/primitive/group/group_from_rag.cc:
      	Here.
      	* scribo/filter/objects_with_holes.hh,
      	* scribo/table/internal/repair_lines.hh,
      	* src/text_recognition_in_picture.cc:
      	Do not include mln/core/var.hh.
      f303e006
    • Roland Levillain's avatar
      Re-enable Milena test world/inter_pixel/display_edge. · 967c5779
      Roland Levillain authored
      	* tests/world/inter_pixel/Makefile.am (check_PROGRAMS):
      	Add display edge.
      967c5779
    • Roland Levillain's avatar
      Do not use mln_VAR in Milena tests, apps and tools. · 8e605358
      Roland Levillain authored
      	* apps/constrained-connectivity/constrained-connectivity.cc,
      	* tests/core/image/dmorph/transformed_image.cc,
      	* tests/core/image/dmorph/unproject_image.cc,
      	* tests/core/image/graph_image.cc,
      	* tests/morpho/tree/filter/filter.cc,
      	* tests/world/inter_pixel/compute.cc,
      	* tests/world/inter_pixel/display_edge.cc:
      	Here.
      	* tests/core/routine/extend.cc,
      	* tests/labeling/foreground.cc,
      	* tests/linear/sobel_2d.cc,
      	* tests/morpho/elementary/gradient.cc,
      	* tests/morpho/elementary/gradient_external.cc,
      	* tests/morpho/elementary/gradient_internal.cc,
      	* tests/morpho/elementary/laplacian.cc,
      	* tests/morpho/skeleton_constrained.cc,
      	* tests/morpho/tree/compute_attribute_image.cc,
      	* tests/morpho/tree/compute_parent.cc,
      	* tests/pw/image.cc,
      	* tests/world/inter_pixel/immerse.cc,
      	* tools/area_flooding.cc:
      	Do not include mln/core/var.hh.
      8e605358
  3. 18 Jun, 2014 1 commit
  4. 17 Jun, 2014 4 commits
  5. 23 May, 2014 4 commits
  6. 22 May, 2014 4 commits
  7. 20 May, 2014 1 commit
  8. 02 Apr, 2014 3 commits
  9. 31 Mar, 2014 1 commit
    • Roland Levillain's avatar
      Scribo: Improve scribo-cli's `--version' option. · c75b4cfe
      Roland Levillain authored
      	* src/scribo-cli.in: Move the shebang to the first line.
      	(version): Do not hard-code the version number
      	in scribo-cli.
      	Rephrase the copyright owner for uniformity reasons.
      	* src/Makefile.am (do_subst): Also substitute PACKAGE_VERSION.
      c75b4cfe
  10. 24 Feb, 2014 1 commit
  11. 13 Feb, 2014 15 commits
    • Roland Levillain's avatar
      0b465a3c
    • Roland Levillain's avatar
      apps/bench: Simplify `fast_static' and `faster_static' cases. · a1853472
      Roland Levillain authored
      	* apps/bench/trait.hh (mln_static_qixter, mln_static_qixter_)
      	(mln_static_fwd_qixter, mln_static_fwd_qixter_)
      	(mln_static_bkd_qixter, mln_static_bkd_qixter_):
      	Remove macros.
      	(mln::static_fwd_qixter, mln::static_bkd_qixter):
      	Remove traits.
      	(mln::fwd_qixter< image2d<T>, static_window<D, n> >)
      	(mln::fwd_qixter< const image2d<T>, static_window<D, n> >)
      	(mln::bkd_qixter< image2d<T>, static_window<D, n> >)
      	(mln::bkd_qixter< const image2d<T>, static_window<D, n> >):
      	New traits.
      	* apps/bench/dilation-lena.hh
      	(fast_static::dilation): Delegate to fast::dilation.
      	(faster_static::dilation): Delegate to faster::dilation.
      a1853472
    • Roland Levillain's avatar
      apps/bench: Aesthetic changes in the output of list2table. · 091e1bec
      Roland Levillain authored
      	* apps/bench/list2table: Here.
      091e1bec
    • Roland Levillain's avatar
      apps/bench: New (postprocessing) script: list2table. · 55fd2b0c
      Roland Levillain authored
      	* apps/bench/list2table: New.
      55fd2b0c
    • Roland Levillain's avatar
      apps/bench: Split dilation-lena-bench. · 90d29df9
      Roland Levillain authored
      	* apps/bench/dilation-lena-bench.cc: Remove and split into...
      	* apps/bench/dilation-lena-bench-macros.hh,
      	* apps/bench/dilation-lena-bench-fast.cc,
      	* apps/bench/dilation-lena-bench-fast_static.cc,
      	* apps/bench/dilation-lena-bench-gen.cc,
      	* apps/bench/dilation-lena-bench-nongen.cc,
      	* apps/bench/dilation-lena-bench-nongen_2ptr.cc:
      	...these (new) files.
      	* apps/bench/test-dilation-lena-bench.in: New test.
      	* apps/bench/Makefile.am (noinst_PROGRAMS): Add
      	dilation-lena-bench-nongen, dilation-lena-bench-nongen_2ptr,
      	dilation-lena-bench-gen, dilation-lena-bench-fast and
      	dilation-lena-bench-fast_static.
      	Remove dilation-lena-bench.
      	(noinst_HEADERS): Add dilation-lena-bench-macros.hh.
      	(edit): New variable.
      	(EXTRA_DIST): Add test-dilation-lena-bench.in.
      	(test-dilation-lena-bench): New target.
      	(TESTS, CLEANFILES): Add test-dilation-lena-bench.
      90d29df9
    • Roland Levillain's avatar
      apps/bench: New experiment: dilation-lena-bench. · b43f22a4
      Roland Levillain authored
      	* apps/bench/dilation-lena-bench.cc: New.
      	* apps/bench/Makefile.am (noinst_PROGRAMS):
      	Add dilation-lena-bench.
      b43f22a4
    • Roland Levillain's avatar
      apps/bench: Have dilation-lena-table behave more like dilation-lena. · 27fd9c88
      Roland Levillain authored
      	* apps/bench/dilation-lena-table.cc: Here.
      	* apps/bench/Makefile.am (MOSTLYCLEANFILES): Update.
      27fd9c88
    • Roland Levillain's avatar
      apps/bench: Misc. changes. · b368f268
      Roland Levillain authored
      	* apps/bench/dilation-lena.hh,
      	* apps/bench/dilation-lena.cc,
      	* apps/bench/dilation-lena-table.cc:
      	Here.
      	* apps/bench/Makefile.am (AM_CXXFLAGS):
      	Set to $(APPS_CXXFLAGS_NODEBUG)
      b368f268
    • Roland Levillain's avatar
    • Roland Levillain's avatar
      apps/bench: Generate a LaTeX table from some results of dilation-lena. · 26be3832
      Roland Levillain authored
      	* apps/bench/dilation-lena-table.cc: New.
      	* apps/bench/Makefile.am (noinst_PROGRAMS):
      	Add dilation-lena-table.
      26be3832
    • Roland Levillain's avatar
      apps/bench: Split dilation-lena.cc. · a2742cb6
      Roland Levillain authored
      	* apps/bench/dilation-lena.cc
      	(nongen::dilation)
      	(nongen_2ptr::dilation)
      	(nongen_1ptr::dilation)
      	(gen::dilation)
      	(fast::dilation)
      	(fast_noaccu::dilation)
      	(faster::dilation)
      	(faster_noaccu::dilation)
      	(fast_static::dilation)
      	(faster_static::dilation):
      	Move functions...
      	* apps/bench/dilation-lena.hh: ...here (new file).
      	* apps/bench/dilation-lena.cc: Adjust.
      	* apps/bench/Makefile.am (noinst_HEADERS): Add dilation-lena.hh
      a2742cb6
    • Roland Levillain's avatar
      apps/bench: More comparisons (2- and 1-pointer based non-gen impl.). · 1f64874f
      Roland Levillain authored
      	* apps/bench/trait.hh: New.
      	Use it...
      	* apps/bench/dilation-lena.cc: ...here.
      	(nongen_2ptr::dilation, nongen_1ptr::dilation): New functions.
      	Exercise them...
      	(run): ...here.
      	(main): Store the number of iterations in a variable.
      	* apps/bench/static_dpoints_pixter.hh
      	(mln::static_dpoints_fwd_pixter<I, n>)
      	(mln::static_dpoints_bkd_pixter<I, n>):
      	Turn into...
      	(mln::static_dpoints_fwd_pixter<I, W>)
      	(mln::static_dpoints_bkd_pixter<I, W>):
      	...these, so that these pixters are built from a (static) window
      	instead of a length.
      	(mln::static_dpoints_fwd_pixter<I, W>::n)
      	(mln::static_dpoints_bkd_pixter<I, W>::n):
      	New attributes.
      	* apps/bench/static_window.hh
      	(mln::static_window<D, n>::Size): Rename as...
      	(mln::static_window<D, n>::length): ...this.
      	* apps/bench/Makefile.am (noinst_HEADERS): Add trait.hh.
      	(MOSTLYCLEANFILES): Update.
      1f64874f
    • Roland Levillain's avatar
      apps/bench: Run more test cases, make comparisons more robust, factor. · f588e466
      Roland Levillain authored
      	* apps/bench/dilation-lena.cc
      	(DILATION_WITH_BUILTIN_WINDOW, DILATION): New macros.
      	Use them to factor repetitive code...
      	(run): ...here (new function).
      	Call it from...
      	(main): ...here, and adjust.
      	* apps/bench/lena2048.pgm: New.
      	* apps/bench/Makefile.am (EXTRA_DIST): Add lena2048.pgm.
      	(MOSTLYCLEANFILES): Update.
      f588e466
    • Roland Levillain's avatar
      apps/bench: More comparisons on dilation (static win + single pixter). · 1e7c979f
      Roland Levillain authored
      	* apps/bench/dilation-lena.cc (faster_static::dilation):
      	New function.
      	Exercise it...
      	(main): ...here.
      	* apps/bench/Makefile.am (MOSTLYCLEANFILES): Update.
      1e7c979f
    • Roland Levillain's avatar
      apps/bench: More comparisons on dilation (variants without accu). · ccb4093b
      Roland Levillain authored
      	* apps/bench/dilation-lena.cc
      	(fast_noaccu::dilation, faster_noaccu::dilation): New functions.
      	Exercise them...
      	(main): ...here.
      	* apps/bench/Makefile.am (MOSTLYCLEANFILES): Update.
      ccb4093b