hop Index: 10.246/oln.prj --- 10.246/oln.prj +++ 10.246(w)/oln.prj @@ -76,7 +76,7 @@ "diffs.patch$" "/Makefile.in$" "^Makefile.in$" - "/makefile.swig" + "/makefile.swig" "/\\(py-compile\\|missing\\|install-sh\\|mkinstalldirs\\|depcomp\\|mdate-sh\\)$" "\\(texinfo\\.tex\\)$" "^\\(.*/\\)\\?aclocal.m4$" @@ -120,17 +120,24 @@ "olena/img/lena1d.pbm" "olena/img/lena1d16b.ppbm" "\\.xvpics/" - "old/")) + "old/" + "^config/config\\.sub$" + "^doc/ref/exdoc\\.mk$" + "^doc/ref/out/exdoc\\.config$" + "^config/config\\.guess$" + "^doc/ref/doxygen\\.config$" + "^config/ltmain\\.sh$" + "^libtool$")) (Project-Keywords) (Files - (ChangeLog (oln/o/33_ChangeLog 1.37.1.16.1.17.1.19.1.26 600)) - (doc/ChangeLog (oln/o/31_ChangeLog 1.38.1.7.1.5.1.14.1.16 600)) - (integre/ChangeLog (oln/q/35_ChangeLog 1.12.1.2.1.50 600)) - (metalic/ChangeLog (oln/q/30_ChangeLog 1.3.1.43 600)) - (olena/ChangeLog (oln/o/30_ChangeLog 1.27.1.36.1.3.1.11.1.5.1.64.1.47.1.93.1.27.2.11 600)) + (ChangeLog (oln/o/33_ChangeLog 1.37.1.16.1.17.1.19.1.27 600)) + (doc/ChangeLog (oln/o/31_ChangeLog 1.38.1.7.1.5.1.14.1.17 600)) + (integre/ChangeLog (oln/q/35_ChangeLog 1.12.1.2.1.51 600)) + (metalic/ChangeLog (oln/q/30_ChangeLog 1.3.1.44 600)) + (olena/ChangeLog (oln/o/30_ChangeLog 1.27.1.36.1.3.1.11.1.5.1.64.1.47.1.93.1.27.2.12 600)) (tools/ChangeLog (oln/o/32_ChangeLog 1.10.1.17 600)) - (tools/swilena/ChangeLog (oln/n/37_ChangeLog 1.7.1.47 600)) + (tools/swilena/ChangeLog (oln/n/37_ChangeLog 1.7.1.48 600)) (olena/ChangeLog.0 (oln/6_ChangeLog 1.50.1.98.1.5 600)) (doc/ChangeLog.0 (oln/e/1_ChangeLog 1.31 600)) @@ -1526,10 +1533,10 @@ ;; Files added by populate at Thu, 03 Aug 2006 15:59:48 +0200, ;; to version 10.244(w), by theo: - (libtool (oln/w/47_libtool 1.1 755)) - (config/ltmain.sh (oln/w/48_ltmain.sh 1.1 644)) - (config/config.sub (oln/w/49_config.sub 1.1 755)) - (config/config.guess (oln/w/50_config.gue 1.1 755)) + + + + (olena/oln/lrde/ufmt/basic_salembier.hh (oln/w/51_basic_sale 1.1 644)) (olena/oln/lrde/ufmt/bin/basic_maxtree.cc (oln/x/0_basic_maxt 1.2 644)) (olena/oln/lrde/ufmt/bin/basic_salembier.cc (oln/x/1_basic_sale 1.1 644)) @@ -1541,23 +1548,23 @@ (olena/oln/lrde/ufmt/img/lena64.pgm (oln/x/6_lena64.pgm 1.1 644)) (olena/oln/lrde/ufmt/img/lena6.pgm (oln/x/7_lena6.pgm 1.1 644)) (olena/oln/lrde/ufmt/utils.hh (oln/x/8_utils.hh 1.2 644)) - (doc/ref/exdoc.mk (oln/x/9_exdoc.mk 1.1 644)) - (doc/ref/doxygen.config (oln/x/10_doxygen.co 1.1 644)) - (doc/ref/out/exdoc.config (oln/x/11_exdoc.conf 1.1 644)) + + + ;; Files added by populate at Fri, 04 Aug 2006 18:38:31 +0200, ;; to version 10.245(w), by theo: - (olena/oln/lrde/ufmt/ai_maxtree.hh (oln/x/12_ai_maxtree 1.1 644)) - (olena/oln/lrde/ufmt/si_maxtree.hh (oln/x/13_si_maxtree 1.1 644)) - (olena/oln/lrde/ufmt/rup_maxtree.hh (oln/x/14_rup_maxtre 1.1 644)) - (olena/oln/lrde/ufmt/sp_maxtree.hh (oln/x/15_sp_maxtree 1.1 644)) + (olena/oln/lrde/ufmt/ad_maxtree.hh (oln/x/12_ai_maxtree 1.1 644)) + (olena/oln/lrde/ufmt/hdc_maxtree.hh (oln/x/13_si_maxtree 1.1 644)) + (olena/oln/lrde/ufmt/rpc_maxtree.hh (oln/x/14_rup_maxtre 1.1 644)) + (olena/oln/lrde/ufmt/hpc_maxtree.hh (oln/x/15_sp_maxtree 1.1 644)) (olena/oln/lrde/ufmt/ap_maxtree.hh (oln/x/16_ap_maxtree 1.1 644)) - (olena/oln/lrde/ufmt/r1_maxtree.hh (oln/x/17_r1_maxtree 1.1 644)) - (olena/oln/lrde/ufmt/bin/rup_maxtree.cc (oln/x/18_rup_maxtre 1.1 644)) - (olena/oln/lrde/ufmt/bin/si_maxtree.cc (oln/x/19_si_maxtree 1.1 644)) - (olena/oln/lrde/ufmt/bin/sp_maxtree.cc (oln/x/20_sp_maxtree 1.1 644)) - (olena/oln/lrde/ufmt/bin/r1_maxtree.cc (oln/x/21_r1_maxtree 1.1 644)) + (olena/oln/lrde/ufmt/r1ic_maxtree.hh (oln/x/17_r1_maxtree 1.1 644)) + (olena/oln/lrde/ufmt/bin/rpc_maxtree.cc (oln/x/18_rup_maxtre 1.1 644)) + (olena/oln/lrde/ufmt/bin/hdc_maxtree.cc (oln/x/19_si_maxtree 1.1 644)) + (olena/oln/lrde/ufmt/bin/hpc_maxtree.cc (oln/x/20_sp_maxtree 1.1 644)) + (olena/oln/lrde/ufmt/bin/r1ic_maxtree.cc (oln/x/21_r1_maxtree 1.1 644)) @@ -1579,4 +1586,16 @@ (Merge-Parents (10.245 complete) ) -(New-Merge-Parents) +(New-Merge-Parents + (10.248 incomplete) + (10.248 incomplete) + (10.248 complete + (ChangeLog ChangeLog ChangeLog r) (doc/ChangeLog doc/ChangeLog doc/ChangeLog r) + (integre/ChangeLog integre/ChangeLog integre/ChangeLog r) (metalic/ChangeLog metalic/ChangeLog metalic/ChangeLog r) + (olena/ChangeLog olena/ChangeLog olena/ChangeLog r) (tools/swilena/ChangeLog tools/swilena/ChangeLog tools/swilena/ChangeLog r) + (libtool libtool () d) (config/ltmain.sh config/ltmain.sh () d) + (config/config.sub config/config.sub () d) (config/config.guess config/config.guess () d) + (doc/ref/exdoc.mk doc/ref/exdoc.mk () d) (doc/ref/doxygen.config doc/ref/doxygen.config () d) + (doc/ref/out/exdoc.config doc/ref/out/exdoc.config () d) + ) +) Index: 10.246/ChangeLog --- 10.246/ChangeLog Fri, 04 Aug 2006 18:48:35 +0200 theo (oln/o/33_ChangeLog 1.37.1.16.1.17.1.19.1.26 600) +++ 10.246(w)/ChangeLog Mon, 21 Aug 2006 17:06:44 +0200 theo (oln/o/33_ChangeLog 1.37.1.16.1.17.1.19.1.27 600) @@ -1,41 +1,3 @@ -2006-08-04 Thierry GERAUD <theo@tegucigalpa.lrde.epita.fr> - - Factor some code in oln/lrde/ufmt/; add video raster scan - algorithms and some versions with points as indices. - - * olena/oln/lrde/ufmt/README: New. - * olena/oln/lrde/ufmt/basic_maxtree.hh: Move some parts into... - * olena/oln/lrde/ufmt/ap_maxtree.hh: ...this new file. - * olena/oln/lrde/ufmt/sp_maxtree.hh: New. - * olena/oln/lrde/ufmt/ai_maxtree.hh: New. - * olena/oln/lrde/ufmt/si_maxtree.hh: New. - * olena/oln/lrde/ufmt/rup_maxtree.hh: New. - * olena/oln/lrde/ufmt/bin/sp_maxtree.cc: New. - * olena/oln/lrde/ufmt/bin/si_maxtree.cc: New. - * olena/oln/lrde/ufmt/bin/rup_maxtree.cc: New. - * olena/oln/lrde/ufmt/bin/r1_maxtree.cc: New. - -2006-08-03 Thierry GERAUD <theo@tegucigalpa.lrde.epita.fr> - - Add some first code corresponding to an LRDE publication about - union-find and max-tree. - - * olena/oln/lrde: New directory for code related to LRDE - publications. - * olena/oln/lrde/ufmt: New directory specific to union-find and - max-tree. - * olena/oln/lrde/ufmt/log.hh: New. - * olena/oln/lrde/ufmt/utils.hh: New. - * olena/oln/lrde/ufmt/basic_maxtree.hh: New. - * olena/oln/lrde/ufmt/basic_salembier.hh: New. - * olena/oln/lrde/ufmt/bin: New directory for corresponding - bin source. - * olena/oln/lrde/ufmt/bin/basic_maxtree.cc: New. - * olena/oln/lrde/ufmt/bin/basic_salembier.cc: New. - * olena/oln/lrde/ufmt/img: New directory for tiny test images. - * olena/oln/lrde/ufmt/img/lena6.pgm: New image file. - * olena/oln/lrde/ufmt/img/lena64.pgm: Likewise. - 2006-07-11 Roland Levillain <roland@lrde.epita.fr> Use Libtool. Index: 10.246/doc/ChangeLog --- 10.246/doc/ChangeLog Fri, 09 Jul 2004 15:37:35 +0200 palma_g (oln/o/31_ChangeLog 1.38.1.7.1.5.1.14.1.16 600) +++ 10.246(w)/doc/ChangeLog Mon, 21 Aug 2006 17:06:48 +0200 theo (oln/o/31_ChangeLog 1.38.1.7.1.5.1.14.1.17 600) @@ -65,8 +65,8 @@ 2004-04-09 Damien Thivolle <damien@lrde.epita.fr> - * doc/ref/Makefile.am: Use `clean-local' and `distclean-local' to delete - files. + * doc/ref/Makefile.am: Use `clean-local' and `distclean-local' to + delete files. * doc/ref/out/exdoc.config.in: Add `DOC_CPPFLAGS' to the compilation flags. @@ -151,7 +151,7 @@ 2003-08-26 Geoffroy Fouquier <Geoffroy.Fouquier@lrde.epita.fr> - * dev/oln-dev.texi: fix. + * dev/oln-dev.texi: fix. 2003-08-25 Nicolas Burrus <burrus_n@lrde.epita.fr> @@ -499,7 +499,8 @@ * configure.ac: Adjust Olena source path. Use AC_CXX_FLAGS instead of AC_WITH_CXX_WARNINGS. Use AC_CONFIG_FILES again. - * Makefile.am: Comment. Correct @OLN_DOC_SUBDIRS@ to $(OLN_DOC_SUBDIRS). + * Makefile.am: Comment. Correct @OLN_DOC_SUBDIRS@ to + $(OLN_DOC_SUBDIRS). 2003-01-15 Akim Demaille <akim@epita.fr> @@ -525,7 +526,8 @@ 2002-12-12 Raphaël Poss <raph@lrde.epita.fr> - * demo/Makefile.am (check_PROGRAMS): Now use OLN_CPPFLAGS and OLN_CXXFLAGS. + * demo/Makefile.am (check_PROGRAMS): Now use OLN_CPPFLAGS and + OLN_CXXFLAGS. * doc/Makefile.am (COMMONGETDEFSFLAGS): Likewise. Use OLN_IMG_DIR and DEFS, too. Index: 10.246/integre/ChangeLog --- 10.246/integre/ChangeLog Wed, 05 Jul 2006 18:07:27 +0200 levill_r (oln/q/35_ChangeLog 1.12.1.2.1.50 600) +++ 10.246(w)/integre/ChangeLog Mon, 21 Aug 2006 17:06:51 +0200 theo (oln/q/35_ChangeLog 1.12.1.2.1.51 600) @@ -11,7 +11,7 @@ * tests/types/tests/float_r2, tests/types/tests/range2, * tests/types/tests/range2b: Fix tests. - + 2005-09-15 Roland Levillain <roland@lrde.epita.fr> Adjust for G++ 4.0. @@ -38,11 +38,11 @@ 2004-04-20 Niels Van Vliet <niels@lrde.epita.fr> - * integre/tests/sanity/Makefile.am: Replace maintainer-check by check. + * tests/sanity/Makefile.am: Replace maintainer-check by check. 2004-04-20 Niels Van Vliet <niels@lrde.epita.fr> - * integre/ntg/core/internal/traits.hh: Include headers so as to pass + * ntg/core/internal/traits.hh: Include headers so as to pass sanity check. 2004-04-20 Niels Van Vliet <niels@lrde.epita.fr> @@ -64,13 +64,15 @@ * ntg/makefile.src: Add file. 2004-03-30 Niels Van Vliet <niels@lrde.epita.fr> - * integre/ntg/core/pred_succ.hh: Add default_less. - * integre/ntg/color/color.hh: Add default_less specialization. + + * ntg/core/pred_succ.hh: Add default_less. + * ntg/color/color.hh: Add default_less specialization. 2004-03-26 Niels Van Vliet <niels@lrde.epita.fr> - * integre/ntg/core/macros.hh: Add macros ntg_if_vectorial_nb_comp and + + * ntg/core/macros.hh: Add macros ntg_if_vectorial_nb_comp and ntg_compare_nb_comp. - * integre/tests/types/tests/ntg_compare_nb_comp: Add file. + * tests/types/tests/ntg_compare_nb_comp: Add file. 2004-03-23 Giovanni Palma <giovanni@lrde.epita.fr> @@ -82,13 +84,13 @@ 2004-03-19 Niels Van Vliet <niels@lrde.epita.fr> - * integre/ntg/core/pred_succ.hh: Add file. - * integre/ntg/Makefile.am: Add file references. + * ntg/core/pred_succ.hh: Add file. + * ntg/Makefile.am: Add file references. 2004-03-18 Niels Van Vliet <niels@lrde.epita.fr> - * integre/ntg/real/behavior.hh: Change the unsafe::get<T>::check(). - * integre/ntg/utils/cast.hh: Change cast::force(). + * ntg/real/behavior.hh: Change the unsafe::get<T>::check(). + * ntg/utils/cast.hh: Change cast::force(). 2004-02-09 Giovanni Palma <giovanni@lrde.epita.fr> @@ -237,18 +239,18 @@ 2003-07-30 Nicolas Burrus <burrus_n@lrde.epita.fr> - * ntg/utils/cast.hh: Fix compilation with g++ 3.4. - * ntg/utils/debug.hh: Likewise. - * ntg/core/internal/global_ops_defs.hh: Likewise. - * ntg/core/internal/global_ops.hh: Likewise. - * ntg/color/nrgb.hh: Likewise. - * ntg/real/optraits_builtin_int.hh: Likewise. - * ntg/real/optraits_scalar.hh: Likewise. - * ntg/real/typetraits_builtin_int.hh: Likewise. - * tests/utils/tests/debug1: Likewise. - * ntg/core/contract.hh: Likewise. - * ntg/vect/vec.hh: Likewise. - * ntg/vect/cplx.hh: Likewise. + * ntg/utils/cast.hh: Fix compilation with g++ 3.4. + * ntg/utils/debug.hh: Likewise. + * ntg/core/internal/global_ops_defs.hh: Likewise. + * ntg/core/internal/global_ops.hh: Likewise. + * ntg/color/nrgb.hh: Likewise. + * ntg/real/optraits_builtin_int.hh: Likewise. + * ntg/real/optraits_scalar.hh: Likewise. + * ntg/real/typetraits_builtin_int.hh: Likewise. + * tests/utils/tests/debug1: Likewise. + * ntg/core/contract.hh: Likewise. + * ntg/vect/vec.hh: Likewise. + * ntg/vect/cplx.hh: Likewise. 2003-07-28 Nicolas Burrus <burrus_n@lrde.epita.fr> @@ -733,18 +735,17 @@ 2003-03-03 Nicolas Burrus <burrus_n@lrde.epita.fr> - * integre/ntg/behaviour.hh, integre/ntg/global_ops_traits.hh, + * ntg/behaviour.hh, integre/ntg/global_ops_traits.hh, integre/ntg/optraits_cplx.hh, integre/ntg/optraits_int_s.hh, integre/ntg/optraits_vec.hh: Update includes. - * integre/ntg/cycle.hh, integre/ntg/global_ops.hh, + * ntg/cycle.hh, integre/ntg/global_ops.hh, integre/ntg/optraits_cplx.hh, integre/ntg/optraits_cycle.hh, integre/ntg/optraits_int_s.hh, integre/ntg/range.hh, integre/ntg/behaviour.hh, integre/ntg/cplx.hh, integre/ntg/optraits_scalar.hh, integre/ntg/optraits_vec.hh: Likewise. - 2003-03-02 Nicolas Burrus <burrus_n@lrde.epita.fr> * tests/Makefile.am: Add check/defs.in into EXTRA_DIST. Index: 10.246/metalic/ChangeLog --- 10.246/metalic/ChangeLog Sat, 26 Jun 2004 23:19:24 +0200 thivol_d (oln/q/30_ChangeLog 1.3.1.43 600) +++ 10.246(w)/metalic/ChangeLog Mon, 21 Aug 2006 17:06:56 +0200 theo (oln/q/30_ChangeLog 1.3.1.44 600) @@ -4,7 +4,7 @@ 2004-04-20 Niels Van Vliet <niels@lrde.epita.fr> - * metalic/tests/sanity/Makefile.am: Replace maintainer-check by check. + * tests/sanity/Makefile.am: Replace maintainer-check by check. 2004-04-20 Niels Van Vliet <niels@lrde.epita.fr> @@ -50,25 +50,25 @@ 2003-08-07 Nicolas Burrus <burrus_n@lrde.epita.fr> - * mlc/contract.hh: Fix coding style. - * mlc/objs.hh: Likewise. - * mlc/typeadj.hh: Likewise. - * mlc/type.hh: Likewise. - * mlc/array/1d.hh: Likewise. - * mlc/array/1d.hxx: Likewise. - * mlc/array/2d.hh: Likewise. - * mlc/array/2d.hxx: Likewise. - * mlc/array/3d.hh: Likewise. - * mlc/array/3d.hxx: Likewise. - * mlc/array/nd.hh: Likewise. - * mlc/bool.hh: Likewise. - * mlc/cmp.hh: Likewise. - * mlc/optional.hh: Likewise. - * mlc/is_a.hh: Likewise. - * mlc/math.hh: Likewise. - * mlc/array/objs.hh: Likewise. - * tests/main/tests/ensure3: Likewise. - * tests/main/tests/ensure2: Likewise. + * mlc/contract.hh: Fix coding style. + * mlc/objs.hh: Likewise. + * mlc/typeadj.hh: Likewise. + * mlc/type.hh: Likewise. + * mlc/array/1d.hh: Likewise. + * mlc/array/1d.hxx: Likewise. + * mlc/array/2d.hh: Likewise. + * mlc/array/2d.hxx: Likewise. + * mlc/array/3d.hh: Likewise. + * mlc/array/3d.hxx: Likewise. + * mlc/array/nd.hh: Likewise. + * mlc/bool.hh: Likewise. + * mlc/cmp.hh: Likewise. + * mlc/optional.hh: Likewise. + * mlc/is_a.hh: Likewise. + * mlc/math.hh: Likewise. + * mlc/array/objs.hh: Likewise. + * tests/main/tests/ensure3: Likewise. + * tests/main/tests/ensure2: Likewise. 2003-08-06 Nicolas Burrus <burrus_n@lrde.epita.fr> @@ -267,7 +267,7 @@ 2003-03-03 Nicolas Burrus <burrus_n@lrde.epita.fr> * mlc/array1d.hh, mlc/array2d.hh, mlc/array3d.hh: Update - includes. + includes. * mlc/is_a.hh: Likewise. Index: 10.246/olena/ChangeLog --- 10.246/olena/ChangeLog Wed, 05 Jul 2006 18:22:20 +0200 levill_r (oln/o/30_ChangeLog 1.27.1.36.1.3.1.11.1.5.1.64.1.47.1.93.1.27.2.11 600) +++ 10.246(w)/olena/ChangeLog Mon, 21 Aug 2006 17:06:56 +0200 theo (oln/o/30_ChangeLog 1.27.1.36.1.3.1.11.1.5.1.64.1.47.1.93.1.27.2.12 600) @@ -1,3 +1,41 @@ +2006-08-04 Thierry GERAUD <theo@tegucigalpa.lrde.epita.fr> + + Factor some code in oln/lrde/ufmt/; add video raster scan + algorithms and some versions with points as indices. + + * oln/lrde/ufmt/README: New. + * oln/lrde/ufmt/basic_maxtree.hh: Move some parts into... + * oln/lrde/ufmt/ap_maxtree.hh: ...this new file. + * oln/lrde/ufmt/sp_maxtree.hh: New. + * oln/lrde/ufmt/ai_maxtree.hh: New. + * oln/lrde/ufmt/si_maxtree.hh: New. + * oln/lrde/ufmt/rup_maxtree.hh: New. + * oln/lrde/ufmt/bin/sp_maxtree.cc: New. + * oln/lrde/ufmt/bin/si_maxtree.cc: New. + * oln/lrde/ufmt/bin/rup_maxtree.cc: New. + * oln/lrde/ufmt/bin/r1_maxtree.cc: New. + +2006-08-03 Thierry GERAUD <theo@tegucigalpa.lrde.epita.fr> + + Add some first code corresponding to an LRDE publication about + union-find and max-tree. + + * oln/lrde: New directory for code related to LRDE + publications. + * oln/lrde/ufmt: New directory specific to union-find and + max-tree. + * oln/lrde/ufmt/log.hh: New. + * oln/lrde/ufmt/utils.hh: New. + * oln/lrde/ufmt/basic_maxtree.hh: New. + * oln/lrde/ufmt/basic_salembier.hh: New. + * oln/lrde/ufmt/bin: New directory for corresponding + bin source. + * oln/lrde/ufmt/bin/basic_maxtree.cc: New. + * oln/lrde/ufmt/bin/basic_salembier.cc: New. + * oln/lrde/ufmt/img: New directory for tiny test images. + * oln/lrde/ufmt/img/lena6.pgm: New image file. + * oln/lrde/ufmt/img/lena64.pgm: Likewise. + 2006-07-05 Roland Levillain <roland@lrde.epita.fr> Fix sanity tests. @@ -156,10 +194,14 @@ 2004-07-09 Giovanni Palma <giovanni@lrde.epita.fr> * oln/utils/qsort.hh: Correct comparison operators. - * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh3: Correct test. - * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh2: Likewise. - * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh2: Remove file. - * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh3: Likewise. + * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh3: + Correct test. + * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh2: + Likewise. + * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh2: + Remove file. + * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh3: + Likewise. * oln/morpho/attributes.hh: Make code use ntg macros. * oln/morpho/attribute_union_find.hh: Add a static if for sort choice. * oln/morpho/attribute_closing_opening.hh: Add prototypes. @@ -215,8 +257,10 @@ * oln/basics.hh: Add behavior.hh. * oln/core/behavior.hh: Add an empty constructor for any_with_diamond. * oln/makefile.src: Add border morpher file. - * oln/convol/fast_convolution.hh: Use border morpher, fix the size problem. - * tests/convol/tests/fast_convol: Improve test comparing with slow version. + * oln/convol/fast_convolution.hh: Use border morpher, fix the size + problem. + * tests/convol/tests/fast_convol: Improve test comparing with slow + version. * oln/morpher/border_morpher.hh: Border morpher. * tests/morpher/tests/border: Test border morpher. @@ -240,7 +284,8 @@ * oln/convol/fast_convolution.hh: Clean code. * oln/convol/slow_gaussian.hxx: Fix too generic parameter. * oln/convol/slow_gaussian.hh: Fix delta computation. - * oln/convol/fast_gaussian.hxx: Use cast::bound instead of cast::force. + * oln/convol/fast_gaussian.hxx: Use cast::bound instead of + cast::force. * oln/convol/slow_convolution.hh: Clean code. 2004-06-14 Simon Odou <simon@lrde.epita.fr> @@ -261,17 +306,19 @@ * tests/convol/tests/fast_convol: New. 2004-06-13 Niels Van Vliet <niels@lrde.epita.fr> - * olena/tests/convol/tests/slow_gaussian: New file. + + * tests/convol/tests/slow_gaussian: New file. 2004-06-09 Niels Van Vliet <niels@lrde.epita.fr> - * olena/oln/core/abstract/behavior.hh (adapt_border): Change + + * oln/core/abstract/behavior.hh (adapt_border): Change constness of the image modified to const. - * olena/oln/core/behavior.hh: Likewise. - * olena/oln/convol/slow_gaussian.hh: Add behavior. Remove parameter + * oln/core/behavior.hh: Likewise. + * oln/convol/slow_gaussian.hh: Add behavior. Remove parameter mu. Add doc and example. Add radius_factor. - * olena/oln/convol/slow_gaussian.hxx: Clean code. Remove parameter + * oln/convol/slow_gaussian.hxx: Clean code. Remove parameter mu. Add radius_factor. - * olena/oln/morpho/gradient.inc: Fix doc. + * oln/morpho/gradient.inc: Fix doc. 2004-06-07 Damien Thivolle <damien@lrde.epita.fr> @@ -298,30 +345,30 @@ 2004-05-15 Niels Van Vliet <niels@lrde.epita.fr> - * olena/oln/morpho/attributes.hh (integral): Change the function. + * oln/morpho/attributes.hh (integral): Change the function. 2004-05-14 Niels Van Vliet <niels@lrde.epita.fr> - * olena/oln/morpho/attributes.hh (integral): Fix a bug in the + * oln/morpho/attributes.hh (integral): Fix a bug in the constructor. 2004-05-12 Niels Van Vliet <niels@lrde.epita.fr> - * olena/oln/core/neighborhood3d.hh: Add some common neighborhoods. - * olena/oln/convol/slow_gaussian.hh: Add file. - * olena/oln/convol/slow_gaussian.hxx: Add file. + * oln/core/neighborhood3d.hh: Add some common neighborhoods. + * oln/convol/slow_gaussian.hh: Add file. + * oln/convol/slow_gaussian.hxx: Add file. 2004-04-20 Niels Van Vliet <niels@lrde.epita.fr> - * olena/tests/sanity/Makefile.am: Replace maintainer-check by check. + * tests/sanity/Makefile.am: Replace maintainer-check by check. 2004-04-20 Niels Van Vliet <niels@lrde.epita.fr> - * olena/oln/convert/rgbhsl.hh: Include headers so as to pass + * oln/convert/rgbhsl.hh: Include headers so as to pass sanity check. - * olena/oln/snakes/energies.hh: Likewise. - * olena/oln/utils/buffer.hh: Likewise. - * olena/oln/topo/tarjan/tarjan.hh: Likewise. + * oln/snakes/energies.hh: Likewise. + * oln/utils/buffer.hh: Likewise. + * oln/topo/tarjan/tarjan.hh: Likewise. 2004-04-20 Niels Van Vliet <niels@lrde.epita.fr> @@ -348,18 +395,18 @@ 2004-04-14 Damien Thivolle <damien@lrde.epita.fr> - * olena/tests/morpho/tests/md5_morpho_reconstruction_hh5: Fix to make + * tests/morpho/tests/md5_morpho_reconstruction_hh5: Fix to make compile with ICC. More details are available here: http://www.lrde.epita.fr/cgi-bin/twiki/view/Projects/OlenaConstImages - * olena/tests/morpho/tests/md5_morpho_reconstruction_hh4: Likewise. - * olena/tests/morpho/tests/md5_morpho_reconstruction_hh3: Likewise. - * olena/tests/morpho/tests/md5_morpho_reconstruction_hh2: Likewise. - * olena/tests/morpho/tests/md5_morpho_reconstruction_hh1: Likewise. - * olena/tests/morpho/tests/md5_morpho_reconstruction_hh0: Likewise. - * olena/tests/morpho/tests/md5_morpho_geodesic_erosion_hh1: Likewise. - * olena/tests/morpho/tests/md5_morpho_geodesic_erosion_hh0: Likewise. - * olena/tests/morpho/tests/md5_morpho_geodesic_dilation_hh1: Likewise. - * olena/tests/morpho/tests/md5_morpho_geodesic_dilation_hh0: Likewise. + * tests/morpho/tests/md5_morpho_reconstruction_hh4: Likewise. + * tests/morpho/tests/md5_morpho_reconstruction_hh3: Likewise. + * tests/morpho/tests/md5_morpho_reconstruction_hh2: Likewise. + * tests/morpho/tests/md5_morpho_reconstruction_hh1: Likewise. + * tests/morpho/tests/md5_morpho_reconstruction_hh0: Likewise. + * tests/morpho/tests/md5_morpho_geodesic_erosion_hh1: Likewise. + * tests/morpho/tests/md5_morpho_geodesic_erosion_hh0: Likewise. + * tests/morpho/tests/md5_morpho_geodesic_dilation_hh1: Likewise. + * tests/morpho/tests/md5_morpho_geodesic_dilation_hh0: Likewise. 2004-04-14 Giovanni Palma <giovanni@lrde.epita.fr> @@ -368,21 +415,22 @@ 2004-04-13 Damien Thivolle <damien@lrde.epita.fr> - * olena/tests/convol/tests/md5_convol_fast_gaussian_hh4: Make this test xfail. - * olena/tests/convol/tests/md5_convol_fast_gaussian_hh1: Likewise. + * tests/convol/tests/md5_convol_fast_gaussian_hh4: Make this test + xfail. + * tests/convol/tests/md5_convol_fast_gaussian_hh1: Likewise. 2004-04-13 Damien Thivolle <damien@lrde.epita.fr> - * olena/oln/morpho/geodesic_dilation.hh: Fix to make compile with ICC. - * olena/oln/morpho/geodesic_erosion.hh: Likewise. - * olena/oln/morpho/reconstruction.hh: Likewise. - * olena/oln/topo/tarjan/flat-zone.hh: Likewise. + * oln/morpho/geodesic_dilation.hh: Fix to make compile with ICC. + * oln/morpho/geodesic_erosion.hh: Likewise. + * oln/morpho/reconstruction.hh: Likewise. + * oln/topo/tarjan/flat-zone.hh: Likewise. 2004-04-13 Niels Van Vliet <niels@lrde.epita.fr> - * olena/oln/utils/md5.hxx: Changed abstract::image to + * oln/utils/md5.hxx: Changed abstract::image to oln::abstract::image (ICC error). - * olena/oln/utils/md5.hh: Likewise. + * oln/utils/md5.hh: Likewise. 2004-04-13 Niels Van Vliet <niels@lrde.epita.fr> @@ -414,31 +462,32 @@ 2004-04-12 Niels Van Vliet <niels@lrde.epita.fr> - * olena/oln/core/abstract/image.hh: Fix macro oln_concrete_type. - * olena/tests/morpho/tests/gradient: New. + * oln/core/abstract/image.hh: Fix macro oln_concrete_type. + * tests/morpho/tests/gradient: New. 2004-04-12 Niels Van Vliet <niels@lrde.epita.fr> - * olena/oln/morpho/laplacian.inc: Add a FIXME. - * olena/oln/morpho/watershed.hh: Add a FIXME. + * oln/morpho/laplacian.inc: Add a FIXME. + * oln/morpho/watershed.hh: Add a FIXME. 2004-04-11 Damien Thivolle <damien@lrde.epita.fr> - * olena/oln/core/point2d.hh: Add header include. - * olena/oln/core/point2d.hxx: Likewise. - * olena/oln/core/point3d.hh: Likewise. - * olena/oln/core/point3d.hxx: Likewise. + * oln/core/point2d.hh: Add header include. + * oln/core/point2d.hxx: Likewise. + * oln/core/point3d.hh: Likewise. + * oln/core/point3d.hxx: Likewise. 2004-04-07 Damien Thivolle <damien@lrde.epita.fr> - * olena/oln/Makefile.am: Add forgotten files to the distribution. + * oln/Makefile.am: Add forgotten files to the distribution. 2004-04-04 Simon Odou <simon@lrde.epita.fr> * oln/core/image1d.hh: Add informations to image_id. * oln/core/image2d.hh: Likewise - * oln/core/image3d.hh: Likewise - * oln/core/impl/image_array1d.hh: Add empty constructor for any_with_diamond. + * oln/core/image3d.hh: Likewise + * oln/core/impl/image_array1d.hh: Add empty constructor for + any_with_diamond. * oln/core/impl/image_array.hh: Likewise. * oln/core/impl/image_array2d.hh: Likewise. * oln/core/impl/image_array3d.hh: Likewise. @@ -451,7 +500,8 @@ * tests/morpher/tests/iter: New. * tests/morpher/tests/slicing: New. * oln/core/abstract/image.hh: Size() returns const inside of const &. - * oln/morpher/piece_morpher.hh: Adapt to new version of generic morpher. + * oln/morpher/piece_morpher.hh: Adapt to new version of generic + morpher. Respect 80 columns. * oln/morpher/slicing_morpher.hh: Likewise. * oln/morpher/iter_morpher.hh: Likewise. @@ -461,17 +511,17 @@ 2004-04-03 Damien Thivolle <damien@lrde.epita.fr> - * olena/oln/Makefile.am: Add files. - * olena/oln/morpher/generic_morpher.hh: Repair unmorph(). - * olena/oln/morpher/color_morpher.hh: Correct comments. - * olena/tests/morpher/tests/color_morph: Readd a test. + * oln/Makefile.am: Add files. + * oln/morpher/generic_morpher.hh: Repair unmorph(). + * oln/morpher/color_morpher.hh: Correct comments. + * tests/morpher/tests/color_morph: Readd a test. 2004-04-03 Damien Thivolle <damien@lrde.epita.fr> - * olena/oln/morpher/generic_morpher.hh: Inherit directly from oln::image. - * olena/oln/morpher/subq_morpher.hh: Change inheritance system. - * olena/oln/morpher/color_morpher.hh: Likewise. - * olena/tests/morpher/tests/color_morph: Remove a test. + * oln/morpher/generic_morpher.hh: Inherit directly from oln::image. + * oln/morpher/subq_morpher.hh: Change inheritance system. + * oln/morpher/color_morpher.hh: Likewise. + * tests/morpher/tests/color_morph: Remove a test. 2004-04-02 Giovanni Palma <giovanni@lrde.epita.fr> @@ -480,17 +530,19 @@ * oln/topo/tarjan/tarjan_with_attr.hh: Correct code. 2004-04-02 Niels Van Vliet <niels@lrde.epita.fr> - * olena/oln/io/gz_stream.hh: Fix doc. - * olena/oln/morpho/extrema.hxx: Likewise. - * olena/oln/convol/nagao.hh: Likewise. - * olena/oln/transforms/dwt.hh: Likewise. + + * oln/io/gz_stream.hh: Fix doc. + * oln/morpho/extrema.hxx: Likewise. + * oln/convol/nagao.hh: Likewise. + * oln/transforms/dwt.hh: Likewise. 2004-04-02 Niels Van Vliet <niels@lrde.epita.fr> - * olena/oln/morpho/laplacian.inc (laplacian): Remove slarger_t. + + * oln/morpho/laplacian.inc (laplacian): Remove slarger_t. Add the parameter DestValue. Fix doc. - * olena/tests/morpho/tests/md5_morpho_laplacian_inc1: Change the + * tests/morpho/tests/md5_morpho_laplacian_inc1: Change the test. - * olena/oln/morpho/watershed.hh: Change the two examples. + * oln/morpho/watershed.hh: Change the two examples. 2004-04-02 Giovanni Palma <giovanni@lrde.epita.fr> @@ -502,14 +554,15 @@ * tests/topo/tests/cmap: Make the test use the good flat_zone. 2004-04-02 Niels Van Vliet <niels@lrde.epita.fr> - * olena/oln/core/image1d.hh: Return exact_type in clone_. - * olena/oln/core/image2d.hh: Likewise. - * olena/oln/core/image3d.hh: Likewise. - * olena/oln/core/neighborhood2d.hh: Remove a FIXME. Remove operator=. - * olena/oln/core/window2d.hh: Likewise. - * olena/oln/core/w_window2d.hh: Add comments. - * olena/oln/level/cc.hh: Remove headers. - * olena/oln/morpho/top_hat.inc: Remove a FIXME. + + * oln/core/image1d.hh: Return exact_type in clone_. + * oln/core/image2d.hh: Likewise. + * oln/core/image3d.hh: Likewise. + * oln/core/neighborhood2d.hh: Remove a FIXME. Remove operator=. + * oln/core/window2d.hh: Likewise. + * oln/core/w_window2d.hh: Add comments. + * oln/level/cc.hh: Remove headers. + * oln/morpho/top_hat.inc: Remove a FIXME. 2004-03-31 Giovanni Palma <giovanni@lrde.epita.fr> @@ -522,28 +575,28 @@ 2004-03-30 Damien Thivolle <damien@lrde.epita.fr> - * olena/oln/Makefile.am: Add files from oln/morpher/ - * olena/oln/morpher/generic_morpher.hh: Correct comments and code. - * olena/oln/morpher/subq_morpher.hh: Likewise. - * olena/oln/morpher/color_morpher.hh: Likewise. - * olena/tests/morpher/tests/compose_morph: New file, contains + * oln/Makefile.am: Add files from oln/morpher/ + * oln/morpher/generic_morpher.hh: Correct comments and code. + * oln/morpher/subq_morpher.hh: Likewise. + * oln/morpher/color_morpher.hh: Likewise. + * tests/morpher/tests/compose_morph: New file, contains morpher composition tests. - * olena/tests/morpher/tests/sq_morph: New file, contains sub + * tests/morpher/tests/sq_morph: New file, contains sub quantifying morpher tests. - * olena/tests/morpher/tests/color_morph: New file, contains color + * tests/morpher/tests/color_morph: New file, contains color morpher tests. - * olena/tests/morpher/tests/sq_morph_8: Remove file. - * olena/tests/morpher/tests/sq_morph_7: Likewise. - * olena/tests/morpher/tests/sq_morph_6: Likewise. - * olena/tests/morpher/tests/sq_morph_5: Likewise. - * olena/tests/morpher/tests/sq_morph_4: Likewise. - * olena/tests/morpher/tests/sq_morph_3: Likewise. - * olena/tests/morpher/tests/sq_morph_2: Likewise. - * olena/tests/morpher/tests/sq_morph_1: Likewise. - * olena/tests/morpher/tests/rmorph: Likewise. - * olena/tests/morpher/tests/gmorph: Likewise. - * olena/tests/morpher/tests/color_sq_morph: Likewise. - * olena/tests/morpher/tests/bmorph: Likewise. + * tests/morpher/tests/sq_morph_8: Remove file. + * tests/morpher/tests/sq_morph_7: Likewise. + * tests/morpher/tests/sq_morph_6: Likewise. + * tests/morpher/tests/sq_morph_5: Likewise. + * tests/morpher/tests/sq_morph_4: Likewise. + * tests/morpher/tests/sq_morph_3: Likewise. + * tests/morpher/tests/sq_morph_2: Likewise. + * tests/morpher/tests/sq_morph_1: Likewise. + * tests/morpher/tests/rmorph: Likewise. + * tests/morpher/tests/gmorph: Likewise. + * tests/morpher/tests/color_sq_morph: Likewise. + * tests/morpher/tests/bmorph: Likewise. @@ -568,38 +621,40 @@ * oln/morpher/slicing_morpher.hh: Minor fix. - * olena/oln/core/bkd_iter1d.hh: Fix comments. - * olena/oln/core/bkd_iter2d.hh: Likewise. - * olena/oln/core/bkd_iter3d.hh: Likewise. - * olena/oln/core/fwd_iter1d.hh: Likewise. - * olena/oln/core/fwd_iter2d.hh: Likewise. - * olena/oln/core/fwd_iter3d.hh: Likewise. - * olena/oln/core/abstract/iter1d.hh: Likewise. - * olena/oln/core/abstract/iter2d.hh: Likewise. - * olena/oln/core/abstract/iter3d.hh: Likewise. - * olena/oln/core/abstract/iter.hh: Likewise. - * olena/oln/core/neighborhood1d.hh: Likewise. - * olena/oln/core/neighborhood2d.hh: Likewise. - * olena/oln/core/neighborhood3d.hh: Likewise. - * olena/oln/core/abstract/neighborhood.hh: Likewise. - * olena/oln/core/window1d.hh: Likewise. - * olena/oln/core/window2d.hh: Likewise. - * olena/oln/core/window3d.hh: Likewise. - * olena/oln/core/abstract/window.hh: Likewise. - * olena/oln/core/w_window1d.hh: Likewise. - * olena/oln/core/w_window2d.hh: Likewise. - * olena/oln/core/w_window3d.hh: Likewise. - * olena/oln/core/abstract/w_window.hh: Likewise. - * olena/oln/core/abstract/window_base.hh: Likewise. - * olena/oln/core/abstract/windownd.hh: Likewise. - * olena/oln/core/abstract/w_windownd.hh: Likewise. - * olena/oln/core/abstract/neighborhoodnd.hh: Likewise. + * oln/core/bkd_iter1d.hh: Fix comments. + * oln/core/bkd_iter2d.hh: Likewise. + * oln/core/bkd_iter3d.hh: Likewise. + * oln/core/fwd_iter1d.hh: Likewise. + * oln/core/fwd_iter2d.hh: Likewise. + * oln/core/fwd_iter3d.hh: Likewise. + * oln/core/abstract/iter1d.hh: Likewise. + * oln/core/abstract/iter2d.hh: Likewise. + * oln/core/abstract/iter3d.hh: Likewise. + * oln/core/abstract/iter.hh: Likewise. + * oln/core/neighborhood1d.hh: Likewise. + * oln/core/neighborhood2d.hh: Likewise. + * oln/core/neighborhood3d.hh: Likewise. + * oln/core/abstract/neighborhood.hh: Likewise. + * oln/core/window1d.hh: Likewise. + * oln/core/window2d.hh: Likewise. + * oln/core/window3d.hh: Likewise. + * oln/core/abstract/window.hh: Likewise. + * oln/core/w_window1d.hh: Likewise. + * oln/core/w_window2d.hh: Likewise. + * oln/core/w_window3d.hh: Likewise. + * oln/core/abstract/w_window.hh: Likewise. + * oln/core/abstract/window_base.hh: Likewise. + * oln/core/abstract/windownd.hh: Likewise. + * oln/core/abstract/w_windownd.hh: Likewise. + * oln/core/abstract/neighborhoodnd.hh: Likewise. * oln/morpher/slicing_morpher.hh: To have a slice of an image. * oln/morpher/iter_morpher.hh: To have a specific default iterator. - * oln/morpher/piece_morpher.hh: To use a piece of image like a real one. + * oln/morpher/piece_morpher.hh: To use a piece of image like a + real one. + * oln/core/abstract/image_with_impl.hh: * oln/core/point2d.hh: Able to construct a point2d from a point1d. * oln/core/point2d.hxx: Likewise. @@ -609,63 +664,66 @@ * oln/core/abstract/image_with_impl.hh: Fix (same). 2004-03-29 Niels Van Vliet <niels@lrde.epita.fr> - * olena/oln/topo/inter-pixel/inter-pixel.hh: Change the return type + + * oln/topo/inter-pixel/inter-pixel.hh: Change the return type of operator[] from const & to const. 2004-03-29 Damien Thivolle <damien@lrde.epita.fr> - * olena/oln/morpher/generic_morpher.hh: Correct code and comments. - * olena/oln/morpher/subq_morpher.hh: Add file. Sub quantify morpher + * oln/morpher/generic_morpher.hh: Correct code and comments. + * oln/morpher/subq_morpher.hh: Add file. Sub quantify morpher implementation. - * olena/oln/morpher/color_morpher.hh: Add file. Color morpher + * oln/morpher/color_morpher.hh: Add file. Color morpher implementation. - * olena/tests/morpher/Makefile.am: Add file. Morphers test suite. - * olena/tests/morpher/tests/sq_morph_8: Add file. - * olena/tests/morpher/tests/sq_morph_7: Likewise. - * olena/tests/morpher/tests/sq_morph_6: Likewise. - * olena/tests/morpher/tests/sq_morph_5: Likewise. - * olena/tests/morpher/tests/sq_morph_4: Likewise. - * olena/tests/morpher/tests/sq_morph_3: Likewise. - * olena/tests/morpher/tests/sq_morph_2: Likewise. - * olena/tests/morpher/tests/sq_morph_1: Likewise. - * olena/tests/morpher/tests/rmorph: Likewise. - * olena/tests/morpher/tests/gmorph: Likewise. - * olena/tests/morpher/tests/color_sq_morph: Likewise. - * olena/tests/morpher/tests/bmorph: Likewise. + * tests/morpher/Makefile.am: Add file. Morphers test suite. + * tests/morpher/tests/sq_morph_8: Add file. + * tests/morpher/tests/sq_morph_7: Likewise. + * tests/morpher/tests/sq_morph_6: Likewise. + * tests/morpher/tests/sq_morph_5: Likewise. + * tests/morpher/tests/sq_morph_4: Likewise. + * tests/morpher/tests/sq_morph_3: Likewise. + * tests/morpher/tests/sq_morph_2: Likewise. + * tests/morpher/tests/sq_morph_1: Likewise. + * tests/morpher/tests/rmorph: Likewise. + * tests/morpher/tests/gmorph: Likewise. + * tests/morpher/tests/color_sq_morph: Likewise. + * tests/morpher/tests/bmorph: Likewise. 2004-03-27 Niels Van Vliet <niels@lrde.epita.fr> - * olena/oln/utils/histogram.hh: Change the return type + + * oln/utils/histogram.hh: Change the return type of `at' method to const value_type. - * olena/oln/morpho/attributes.hh: Uncomment some lines. + * oln/morpho/attributes.hh: Uncomment some lines. - * olena/oln/convol/nagao.hh: Correct comments. - * olena/oln/convol/nagao.hxx: Likewise. - * olena/oln/utils/se_stat.hh: Likewise. - * olena/oln/utils/se_stat.hxx: Likewise. + * oln/convol/nagao.hh: Correct comments. + * oln/convol/nagao.hxx: Likewise. + * oln/utils/se_stat.hh: Likewise. + * oln/utils/se_stat.hxx: Likewise. 2004-03-26 Niels Van Vliet <niels@lrde.epita.fr> - * olena/oln/math/macros.hh: Add dot_product. - * olena/oln/utils/se_stat.hh: Add file. Mean and variance using a + + * oln/math/macros.hh: Add dot_product. + * oln/utils/se_stat.hh: Add file. Mean and variance using a structuring element. - * olena/oln/utils/se_stat.hxx: Add file. - * olena/oln/convol/nagao.hh: Add file. Nagao filter. - * olena/oln/convol/nagao.hxx: Add file. - * olena/tests/convol/tests/nagao : Add file. + * oln/utils/se_stat.hxx: Add file. + * oln/convol/nagao.hh: Add file. Nagao filter. + * oln/convol/nagao.hxx: Add file. + * tests/convol/tests/nagao : Add file. 2004-03-25 Damien Thivolle <damien@lrde.epita.fr> - * olena/oln/core/abstract/image.hh: Correct macros. - * olena/oln/core/abstract/image_with_impl.hh: Change the return type + * oln/core/abstract/image.hh: Correct macros. + * oln/core/abstract/image_with_impl.hh: Change the return type of `at' method to const value_type. - * olena/oln/morpher/generic_morpher.hh: Correct comments. + * oln/morpher/generic_morpher.hh: Correct comments. Change parameter names. Fix coding style. 2004-03-25 Damien Thivolle <damien@lrde.epita.fr> - * olena/oln/core/abstract/image.hh: Change the return type of + * oln/core/abstract/image.hh: Change the return type of `operator[]' method to const value_type. Add macros for retrieving types associated to an image. - * olena/oln/morpher/generic_morpher.hh: generic_morpher implementation. + * oln/morpher/generic_morpher.hh: generic_morpher implementation. 2004-03-25 Giovanni Palma <giovanni@lrde.epita.fr> @@ -678,12 +736,12 @@ 2004-03-23 Giovanni Palma <giovanni@lrde.epita.fr> - * olena/tests/level/tests/md5_level_hh0: Add file. + * tests/level/tests/md5_level_hh0: Add file. 2004-03-23 Giovanni Palma <giovanni@lrde.epita.fr> - * olena/tests/level/tests/md5_level_set_level_hh0: Add file. - * olena/tests/level/tests/md5_level_threshold_hh0: Likewise. + * tests/level/tests/md5_level_set_level_hh0: Add file. + * tests/level/tests/md5_level_threshold_hh0: Likewise. 2004-03-23 Giovanni Palma <giovanni@lrde.epita.fr> @@ -692,38 +750,70 @@ 2004-03-23 Giovanni Palma <giovanni@lrde.epita.fr> - * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh2: Add file. - * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh3: Likewise. - * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh4: Likewise. - * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh5: Likewise. - * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh6: Likewise. - * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh7: Likewise. - * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh8: Likewise. - * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh9: Likewise. - * tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh0: Likewise. - * tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh1: Likewise. - * tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh2: Likewise. - * tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh3: Likewise. - * tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh4: Likewise. - * tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh5: Likewise. - * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh0: Likewise. - * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh1: Likewise. - * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh10: Likewise. - * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh11: Likewise. - * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh12: Likewise. - * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh13: Likewise. - * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh14: Likewise. - * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh15: Likewise. - * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh16: Likewise. - * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh17: Likewise. - * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh2: Likewise. - * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh3: Likewise. - * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh4: Likewise. - * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh5: Likewise. - * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh6: Likewise. - * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh7: Likewise. - * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh8: Likewise. - * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh9: Likewise. + * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh2: Add + file. + * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh3: + Likewise. + * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh4: + Likewise. + * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh5: + Likewise. + * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh6: + Likewise. + * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh7: + Likewise. + * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh8: + Likewise. + * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh9: + Likewise. + * tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh0: + Likewise. + * tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh1: + Likewise. + * tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh2: + Likewise. + * tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh3: + Likewise. + * tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh4: + Likewise. + * tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh5: + Likewise. + * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh0: + Likewise. + * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh1: + Likewise. + * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh10: + Likewise. + * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh11: + Likewise. + * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh12: + Likewise. + * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh13: + Likewise. + * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh14: + Likewise. + * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh15: + Likewise. + * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh16: + Likewise. + * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh17: + Likewise. + * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh2: + Likewise. + * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh3: + Likewise. + * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh4: + Likewise. + * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh5: + Likewise. + * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh6: + Likewise. + * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh7: + Likewise. + * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh8: + Likewise. + * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh9: + Likewise. * tests/morpho/tests/md5_morpho_closing_inc0: Likewise. * tests/morpho/tests/md5_morpho_dilation_hh0: Likewise. * tests/morpho/tests/md5_morpho_dilation_hh1: Likewise. @@ -779,12 +869,18 @@ * tests/convol/tests/md5_convol_fast_gaussian_hh4: Add file. * tests/convol/tests/md5_convol_fast_gaussian_hh5: Add file. - * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh0: Remove file. - * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh1: Remove file. - * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh2: Remove file. - * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh3: Remove file. - * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh4: Remove file. - * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh5: Remove file. + * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh0: + Remove file. + * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh1: + Remove file. + * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh2: + Remove file. + * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh3: + Remove file. + * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh4: + Remove file. + * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh5: + Remove file. 2004-03-23 Giovanni Palma <giovanni@lrde.epita.fr> @@ -800,45 +896,46 @@ * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh5: Add file. 2004-03-23 Niels Van Vliet <niels@lrde.epita.fr> - * olena/oln/level/cc.hh (frontp_connected_component): Change image to + + * oln/level/cc.hh (frontp_connected_component): Change image to binary_image. - * olena/oln/level/connected.hh (connected_component): Change image to + * oln/level/connected.hh (connected_component): Change image to binary_image_with_dim. - * olena/oln/morpho/extrema_killer.hh (internal_kill_cc_area): Change + * oln/morpho/extrema_killer.hh (internal_kill_cc_area): Change non_vectorial_image to binary_image_with_dim - * olena/oln/morpho/attribute_closing_opening_map.hh (f_tarjan_map): + * oln/morpho/attribute_closing_opening_map.hh (f_tarjan_map): Change image to non_vectorial_image. 2004-03-19 Simon Odou <simon@lrde.epita.fr> - * olena/oln/core/bkd_iter1d.hh: Correct comments. - * olena/oln/core/bkd_iter2d.hh: Likewise. - * olena/oln/core/bkd_iter3d.hh: Likewise. - * olena/oln/core/fwd_iter1d.hh: Likewise. - * olena/oln/core/fwd_iter2d.hh: Likewise. - * olena/oln/core/fwd_iter3d.hh: Likewise. - * olena/oln/core/abstract/iter1d.hh: Likewise. - * olena/oln/core/abstract/iter2d.hh: Likewise. - * olena/oln/core/abstract/iter3d.hh: Likewise. - * olena/oln/core/abstract/iter.hh: Likewise. - * olena/oln/core/neighborhood1d.hh: Likewise. - * olena/oln/core/neighborhood2d.hh: Likewise. - * olena/oln/core/neighborhood3d.hh: Likewise. - * olena/oln/core/abstract/neighborhood.hh: Likewise. - * olena/oln/core/abstract/struct_elt.hh: Likewise. - * olena/oln/core/window1d.hh: Likewise. - * olena/oln/core/window2d.hh: Likewise. - * olena/oln/core/window3d.hh: Likewise. - * olena/oln/core/abstract/window.hh: Likewise. - * olena/oln/core/w_window1d.hh: Likewise. - * olena/oln/core/w_window2d.hh: Likewise. - * olena/oln/core/w_window3d.hh: Likewise. - * olena/oln/core/abstract/w_window.hh: Likewise. - * olena/oln/io/base.hh: Likewise. - * olena/oln/core/abstract/window_base.hh: Likewise. - * olena/oln/core/abstract/windownd.hh: Likewise. - * olena/oln/core/abstract/w_windownd.hh: Likewise. - * olena/oln/core/abstract/neighborhoodnd.hh: Likewise. + * oln/core/bkd_iter1d.hh: Correct comments. + * oln/core/bkd_iter2d.hh: Likewise. + * oln/core/bkd_iter3d.hh: Likewise. + * oln/core/fwd_iter1d.hh: Likewise. + * oln/core/fwd_iter2d.hh: Likewise. + * oln/core/fwd_iter3d.hh: Likewise. + * oln/core/abstract/iter1d.hh: Likewise. + * oln/core/abstract/iter2d.hh: Likewise. + * oln/core/abstract/iter3d.hh: Likewise. + * oln/core/abstract/iter.hh: Likewise. + * oln/core/neighborhood1d.hh: Likewise. + * oln/core/neighborhood2d.hh: Likewise. + * oln/core/neighborhood3d.hh: Likewise. + * oln/core/abstract/neighborhood.hh: Likewise. + * oln/core/abstract/struct_elt.hh: Likewise. + * oln/core/window1d.hh: Likewise. + * oln/core/window2d.hh: Likewise. + * oln/core/window3d.hh: Likewise. + * oln/core/abstract/window.hh: Likewise. + * oln/core/w_window1d.hh: Likewise. + * oln/core/w_window2d.hh: Likewise. + * oln/core/w_window3d.hh: Likewise. + * oln/core/abstract/w_window.hh: Likewise. + * oln/io/base.hh: Likewise. + * oln/core/abstract/window_base.hh: Likewise. + * oln/core/abstract/windownd.hh: Likewise. + * oln/core/abstract/w_windownd.hh: Likewise. + * oln/core/abstract/neighborhoodnd.hh: Likewise. 2004-03-19 Giovanni Palma <giovanni@lrde.epita.fr> @@ -871,26 +968,28 @@ * oln/transforms/fft.hh: Likewise. 2004-03-19 Niels Van Vliet <niels@lrde.epita.fr> - * olena/oln/utils/histogram.hh: Fix doc. - * olena/oln/convert/value_to_point.hh: Likewise. + + * oln/utils/histogram.hh: Fix doc. + * oln/convert/value_to_point.hh: Likewise. 2004-03-18 Niels Van Vliet <niels@lrde.epita.fr> - * olena/oln/convert/value_to_point.hh: Fix value_to_point<bin>. - * olena/oln/utils/histogram.hh: Fix hisogram<bin>. - * olena/oln/morpho/fast_morpho.hxx: Histogram to abstract histogram. - - * olena/oln/morpho/hit_or_miss.inc: Enable code in the doc. - * olena/oln/morpho/top_hat.inc: Likewise. - * olena/oln/morpho/opening.inc: Likewise. - * olena/oln/morpho/dilation.hh: Likewise. - * olena/oln/morpho/erosion.hh: Likewise. - * olena/oln/morpho/dilation.hh: Likewise. - - * olena/tests/morpho/tests/edoc: Add tests. - - * olena/oln/morpho/attribute_closing_opening_map.hh: Rename images. - * olena/oln/morpho/extrema.hxx: Add doc. - * olena/oln/morpho/closing.inc: Remove fixme. + + * oln/convert/value_to_point.hh: Fix value_to_point<bin>. + * oln/utils/histogram.hh: Fix hisogram<bin>. + * oln/morpho/fast_morpho.hxx: Histogram to abstract histogram. + + * oln/morpho/hit_or_miss.inc: Enable code in the doc. + * oln/morpho/top_hat.inc: Likewise. + * oln/morpho/opening.inc: Likewise. + * oln/morpho/dilation.hh: Likewise. + * oln/morpho/erosion.hh: Likewise. + * oln/morpho/dilation.hh: Likewise. + + * tests/morpho/tests/edoc: Add tests. + + * oln/morpho/attribute_closing_opening_map.hh: Rename images. + * oln/morpho/extrema.hxx: Add doc. + * oln/morpho/closing.inc: Remove fixme. 2004-03-16 Giovanni Palma <giovanni@lrde.epita.fr> @@ -899,85 +998,86 @@ * oln/transforms/wavelet_coeffs.hh: Likewise. 2004-03-15 Damien Thivolle <damien@lrde.epita.fr> - * olena/oln/core/apply.hh: Correct comments. - * olena/oln/core/compose.hh: Correct comments. - * olena/oln/io/file.hh: Add comments. - * olena/oln/io/gz.hh: Likewise. - * olena/oln/io/gz_stream.hh: Likewise. - * olena/oln/io/pnm_read_3d.hh: Likewise. - * olena/oln/io/pnm_read.hh: Likewise. - * olena/oln/io/pnm_write_3d.hh: Likewise. - * olena/oln/io/pnm_write.hh: Likewise. - * olena/oln/io/pnm_common.hh: Likewise. - * olena/oln/io/stream_wrapper.hh: Likewise. - * olena/oln/io/pnm_read_data.hh: Likewise. - * olena/oln/io/pnm_write_data.hh: Likewise. - * olena/oln/io/pnm_read_2d.hh: Likewise. - * olena/oln/io/pnm_write_2d.hh: Likewise. + * oln/core/apply.hh: Correct comments. + * oln/core/compose.hh: Correct comments. + * oln/io/file.hh: Add comments. + * oln/io/gz.hh: Likewise. + * oln/io/gz_stream.hh: Likewise. + * oln/io/pnm_read_3d.hh: Likewise. + * oln/io/pnm_read.hh: Likewise. + * oln/io/pnm_write_3d.hh: Likewise. + * oln/io/pnm_write.hh: Likewise. + * oln/io/pnm_common.hh: Likewise. + * oln/io/stream_wrapper.hh: Likewise. + * oln/io/pnm_read_data.hh: Likewise. + * oln/io/pnm_write_data.hh: Likewise. + * oln/io/pnm_read_2d.hh: Likewise. + * oln/io/pnm_write_2d.hh: Likewise. 2004-03-15 Simon Odou <simon@lrde.epita.fr> - * olena/oln/io/base.hh: Add comments. - * olena/oln/io/readable.hh: Likewise. - * olena/oln/io/se_neighborhood.hh: Likewise. - * olena/oln/io/se_window.hh: Likewise. - * olena/oln/io/image_base.hh: Likewise. - * olena/oln/io/image_write.hh: Likewise. - * olena/oln/io/stream_wrapper.hh: Likewise. - * olena/oln/io/utils.hh: Likewise. - * olena/oln/io/image_read.hh: Likewise. - * olena/oln/core/abstract/image.hh: Likewise. - * olena/oln/core/bkd_iter1d.hh: Correct comments. - * olena/oln/core/bkd_iter2d.hh: Likewise. - * olena/oln/core/bkd_iter3d.hh: Likewise. - * olena/oln/core/fwd_iter1d.hh: Likewise. - * olena/oln/core/fwd_iter2d.hh: Likewise. - * olena/oln/core/fwd_iter3d.hh: Likewise. - * olena/oln/core/abstract/iter1d.hh: Likewise. - * olena/oln/core/abstract/iter2d.hh: Likewise. - * olena/oln/core/abstract/iter3d.hh: Likewise. - * olena/oln/core/abstract/iter.hh: Likewise. - * olena/oln/core/neighborhood1d.hh: Likewise. - * olena/oln/core/neighborhood2d.hh: Likewise. - * olena/oln/core/neighborhood3d.hh: Likewise. - * olena/oln/core/abstract/neighborhood.hh: Likewise. - * olena/oln/core/abstract/struct_elt.hh: Likewise. - * olena/oln/core/window1d.hh: Likewise. - * olena/oln/core/window2d.hh: Likewise. - * olena/oln/core/window3d.hh: Likewise. - * olena/oln/core/abstract/window.hh: Likewise. - * olena/oln/core/w_window1d.hh: Likewise. - * olena/oln/core/w_window2d.hh: Likewise. - * olena/oln/core/w_window3d.hh: Likewise. - * olena/oln/core/abstract/w_window.hh: Likewise. - * olena/oln/core/abstract/window_base.hh: Likewise. - * olena/oln/core/abstract/windownd.hh: Likewise. - * olena/oln/core/abstract/w_windownd.hh: Likewise. - * olena/oln/core/abstract/neighborhoodnd.hh: Likewise. + * oln/io/base.hh: Add comments. + * oln/io/readable.hh: Likewise. + * oln/io/se_neighborhood.hh: Likewise. + * oln/io/se_window.hh: Likewise. + * oln/io/image_base.hh: Likewise. + * oln/io/image_write.hh: Likewise. + * oln/io/stream_wrapper.hh: Likewise. + * oln/io/utils.hh: Likewise. + * oln/io/image_read.hh: Likewise. + * oln/core/abstract/image.hh: Likewise. + * oln/core/bkd_iter1d.hh: Correct comments. + * oln/core/bkd_iter2d.hh: Likewise. + * oln/core/bkd_iter3d.hh: Likewise. + * oln/core/fwd_iter1d.hh: Likewise. + * oln/core/fwd_iter2d.hh: Likewise. + * oln/core/fwd_iter3d.hh: Likewise. + * oln/core/abstract/iter1d.hh: Likewise. + * oln/core/abstract/iter2d.hh: Likewise. + * oln/core/abstract/iter3d.hh: Likewise. + * oln/core/abstract/iter.hh: Likewise. + * oln/core/neighborhood1d.hh: Likewise. + * oln/core/neighborhood2d.hh: Likewise. + * oln/core/neighborhood3d.hh: Likewise. + * oln/core/abstract/neighborhood.hh: Likewise. + * oln/core/abstract/struct_elt.hh: Likewise. + * oln/core/window1d.hh: Likewise. + * oln/core/window2d.hh: Likewise. + * oln/core/window3d.hh: Likewise. + * oln/core/abstract/window.hh: Likewise. + * oln/core/w_window1d.hh: Likewise. + * oln/core/w_window2d.hh: Likewise. + * oln/core/w_window3d.hh: Likewise. + * oln/core/abstract/w_window.hh: Likewise. + * oln/core/abstract/window_base.hh: Likewise. + * oln/core/abstract/windownd.hh: Likewise. + * oln/core/abstract/w_windownd.hh: Likewise. + * oln/core/abstract/neighborhoodnd.hh: Likewise. 2004-03-15 Niels Van Vliet <niels@lrde.epita.fr> - * olena/oln/arith/internal/opdecls.hh: Clean doc. - * olena/oln/arith/ops.hh: Likewise. - * olena/oln/convert/conversion.hh: Likewise. - * olena/oln/convol/convolution.hh: Likewise. - * olena/oln/convol/fast_gaussian.hh: Likewise. - * olena/oln/convol/fast_gaussian.hxx: Likewise. - * olena/oln/core/abstract/dpoint.hh: Likewise. - * olena/oln/core/abstract/iter.hh: Likewise. - * olena/oln/level/cc.hh: Likewise. - * olena/oln/math/macros.hh: Likewise. - * olena/oln/morpho/extrema.hh: Likewise. - * olena/oln/morpho/extrema.hxx: Likewise. - * olena/oln/morpho/fast_morpho.hxx: Likewise. - * olena/oln/topo/dmap.hh: Likewise. - * olena/oln/utils/histogram.hh: Likewise. - * olena/oln/topo/tarjan/union.hh: Likewise. - * olena/oln/topo/inter-pixel/internal/dir.hh: Likewise. - * olena/oln/core/abstract/image.hh: Likewise. - * olena/oln/core/impl/image_array.hh: Likewise. - * olena/oln/convert/abstract/conversion.hh: Likewise. - * olena/oln/snakes/snakes_base.hh: Likewise. - * olena/oln/morpho/attributes.hh: Likewise. - * olena/oln/morpho/attribute_closing_opening_map.hh: Likewise. + + * oln/arith/internal/opdecls.hh: Clean doc. + * oln/arith/ops.hh: Likewise. + * oln/convert/conversion.hh: Likewise. + * oln/convol/convolution.hh: Likewise. + * oln/convol/fast_gaussian.hh: Likewise. + * oln/convol/fast_gaussian.hxx: Likewise. + * oln/core/abstract/dpoint.hh: Likewise. + * oln/core/abstract/iter.hh: Likewise. + * oln/level/cc.hh: Likewise. + * oln/math/macros.hh: Likewise. + * oln/morpho/extrema.hh: Likewise. + * oln/morpho/extrema.hxx: Likewise. + * oln/morpho/fast_morpho.hxx: Likewise. + * oln/topo/dmap.hh: Likewise. + * oln/utils/histogram.hh: Likewise. + * oln/topo/tarjan/union.hh: Likewise. + * oln/topo/inter-pixel/internal/dir.hh: Likewise. + * oln/core/abstract/image.hh: Likewise. + * oln/core/impl/image_array.hh: Likewise. + * oln/convert/abstract/conversion.hh: Likewise. + * oln/snakes/snakes_base.hh: Likewise. + * oln/morpho/attributes.hh: Likewise. + * oln/morpho/attribute_closing_opening_map.hh: Likewise. 2004-03-15 Giovanni Palma <giovanni@lrde.epita.fr> @@ -985,58 +1085,61 @@ * tests/morpho/tests/area: Likewise. 2004-03-14 Niels Van Vliet <niels@lrde.epita.fr> - * olena/oln/arith/internal/opdecls.hh: Changed doxygen commands + + * oln/arith/internal/opdecls.hh: Changed doxygen commands "\{''|attention|warning|bug|note} FIXME" to "\todo FIXME", "\ref" to "REF: ", "\file *.hh" to "\file oln/full/path/*.hh". - * olena/oln/convert/bound.hh: Likewise. - * olena/oln/convert/nrgbxyz.hh: Likewise. - * olena/oln/convert/rgbnrgb.hh: Likewise. - * olena/oln/convert/rgbxyz.hh: Likewise. - * olena/oln/convol/fast_gaussian.hxx: Likewise. - * olena/oln/level/cc.hh: Likewise. - * olena/oln/level/connected.hh: Likewise. - * olena/oln/level/invert.hh: Likewise. - * olena/oln/math/macros.hh: Likewise. - * olena/oln/morpho/extrema.hxx: Likewise. - * olena/oln/topo/dmap.hh: Likewise. - * olena/oln/topo/dmap.hh: Likewise. - * olena/oln/utils/copy.hh: Likewise. - * olena/oln/utils/histogram.hh: Likewise. - * olena/oln/morpho/attribute_union_find.hh: Likewise. - * olena/oln/topo/tarjan/union.hh: Likewise. - * olena/oln/topo/inter-pixel/inter-pixel.hh: Likewise. - * olena/oln/topo/tarjan/flat-zone.hh: Likewise. - * olena/oln/topo/combinatorial-map/cmap.hh: Likewise. - * olena/oln/topo/inter-pixel/fwd-dir-iter.hh: Likewise. - * olena/oln/topo/inter-pixel/bkd-dir-iter.hh: Likewise. - * olena/oln/topo/inter-pixel/internal/dir.hh: Likewise. - * olena/oln/topo/combinatorial-map/internal/anyfunc.hh: Likewise. - * olena/oln/convert/rgbhsv.hh: Likewise. - * olena/oln/convert/rgbhsl.hh: Likewise. - * olena/oln/convert/rgbhsi.hh: Likewise. - * olena/oln/convert/rgbyuv.hh: Likewise. - * olena/oln/convert/rgbyiq.hh: Likewise. - * olena/oln/snakes/snakes_base.hh: Likewise. - * olena/oln/snakes/node.hh: Likewise. - * olena/oln/snakes/segment.hh: Likewise. + * oln/convert/bound.hh: Likewise. + * oln/convert/nrgbxyz.hh: Likewise. + * oln/convert/rgbnrgb.hh: Likewise. + * oln/convert/rgbxyz.hh: Likewise. + * oln/convol/fast_gaussian.hxx: Likewise. + * oln/level/cc.hh: Likewise. + * oln/level/connected.hh: Likewise. + * oln/level/invert.hh: Likewise. + * oln/math/macros.hh: Likewise. + * oln/morpho/extrema.hxx: Likewise. + * oln/topo/dmap.hh: Likewise. + * oln/topo/dmap.hh: Likewise. + * oln/utils/copy.hh: Likewise. + * oln/utils/histogram.hh: Likewise. + * oln/morpho/attribute_union_find.hh: Likewise. + * oln/topo/tarjan/union.hh: Likewise. + * oln/topo/inter-pixel/inter-pixel.hh: Likewise. + * oln/topo/tarjan/flat-zone.hh: Likewise. + * oln/topo/combinatorial-map/cmap.hh: Likewise. + * oln/topo/inter-pixel/fwd-dir-iter.hh: Likewise. + * oln/topo/inter-pixel/bkd-dir-iter.hh: Likewise. + * oln/topo/inter-pixel/internal/dir.hh: Likewise. + * oln/topo/combinatorial-map/internal/anyfunc.hh: Likewise. + * oln/convert/rgbhsv.hh: Likewise. + * oln/convert/rgbhsl.hh: Likewise. + * oln/convert/rgbhsi.hh: Likewise. + * oln/convert/rgbyuv.hh: Likewise. + * oln/convert/rgbyiq.hh: Likewise. + * oln/snakes/snakes_base.hh: Likewise. + * oln/snakes/node.hh: Likewise. + * oln/snakes/segment.hh: Likewise. 2004-03-14 Niels Van Vliet <niels@lrde.epita.fr> - * olena/oln/topo/dmap.hh: Correct comments. - * olena/oln/topo/tarjan/flat-zone.hh: Likewise. + + * oln/topo/dmap.hh: Correct comments. + * oln/topo/tarjan/flat-zone.hh: Likewise. 2004-03-14 Niels Van Vliet <niels@lrde.epita.fr> - * olena/oln/convert/nrgbxyz.hh: Correct comments. - * olena/oln/convert/stretch.hh: Likewise. - * olena/oln/level/cc.hh: Likewise. - * olena/oln/morpho/gradient.inc: Likewise. - * olena/oln/morpho/attribute_closing_opening.hh: Likewise. - * olena/oln/morpho/attribute_union_find.hh: Likewise. - * olena/oln/topo/inter-pixel/inter-pixel.hh: Likewise. - * olena/oln/topo/inter-pixel/node.hh: Likewise. - * olena/oln/core/abstract/image_with_dim.hh: Likewise. - * olena/oln/core/impl/image_impl.hh: Likewise. - * olena/oln/morpho/attributes.hh: Likewise. - * olena/oln/utils/special_points.hh: Likewise. + + * oln/convert/nrgbxyz.hh: Correct comments. + * oln/convert/stretch.hh: Likewise. + * oln/level/cc.hh: Likewise. + * oln/morpho/gradient.inc: Likewise. + * oln/morpho/attribute_closing_opening.hh: Likewise. + * oln/morpho/attribute_union_find.hh: Likewise. + * oln/topo/inter-pixel/inter-pixel.hh: Likewise. + * oln/topo/inter-pixel/node.hh: Likewise. + * oln/core/abstract/image_with_dim.hh: Likewise. + * oln/core/impl/image_impl.hh: Likewise. + * oln/morpho/attributes.hh: Likewise. + * oln/utils/special_points.hh: Likewise. 2004-03-14 Giovanni Palma <giovanni@lrde.epita.fr> @@ -1071,124 +1174,129 @@ * oln/core/abstract/iter.hh: Likewise. 2004-03-14 Niels Van Vliet <niels@lrde.epita.fr> - * olena/oln/core/abstract/iter1d.hh: Fix a bug. - * olena/oln/core/abstract/iter2d.hh: Fix a bug. - * olena/oln/core/abstract/iter3d.hh: Fix a bug. - * olena/oln/morpho/attribute_union_find.hh: Add a FIXME. - * olena/oln/topo/dmap.hh: Add comments. - * olena/oln/topo/tarjan/union.hh: Likewise. - * olena/oln/topo/inter-pixel/inter-pixel.hh: Likewise. - * olena/oln/topo/tarjan/flat-zone.hh: Likewise. - * olena/oln/topo/combinatorial-map/cmap.hh: Likewise. - * olena/oln/topo/combinatorial-map/internal/zeta.hh: Likewise. - * olena/oln/topo/inter-pixel/fwd-dir-iter.hh: Likewise. - * olena/oln/topo/inter-pixel/bkd-dir-iter.hh: Likewise. - * olena/oln/topo/inter-pixel/node.hh: Likewise. - * olena/oln/topo/inter-pixel/internal/dir-iter.hh: Likewise. - * olena/oln/topo/inter-pixel/internal/dir.hh: Likewise. - * olena/oln/topo/combinatorial-map/internal/alpha.hh: Likewise. - * olena/oln/topo/combinatorial-map/internal/anyfunc.hh: Likewise. - * olena/oln/topo/combinatorial-map/internal/beta.hh: Likewise. - * olena/oln/topo/combinatorial-map/internal/lambda.hh: Likewise. - * olena/oln/topo/combinatorial-map/internal/level.hh: Likewise. - * olena/oln/topo/combinatorial-map/internal/sigma.hh : Likewise. + + * oln/core/abstract/iter1d.hh: Fix a bug. + * oln/core/abstract/iter2d.hh: Fix a bug. + * oln/core/abstract/iter3d.hh: Fix a bug. + * oln/morpho/attribute_union_find.hh: Add a FIXME. + * oln/topo/dmap.hh: Add comments. + * oln/topo/tarjan/union.hh: Likewise. + * oln/topo/inter-pixel/inter-pixel.hh: Likewise. + * oln/topo/tarjan/flat-zone.hh: Likewise. + * oln/topo/combinatorial-map/cmap.hh: Likewise. + * oln/topo/combinatorial-map/internal/zeta.hh: Likewise. + * oln/topo/inter-pixel/fwd-dir-iter.hh: Likewise. + * oln/topo/inter-pixel/bkd-dir-iter.hh: Likewise. + * oln/topo/inter-pixel/node.hh: Likewise. + * oln/topo/inter-pixel/internal/dir-iter.hh: Likewise. + * oln/topo/inter-pixel/internal/dir.hh: Likewise. + * oln/topo/combinatorial-map/internal/alpha.hh: Likewise. + * oln/topo/combinatorial-map/internal/anyfunc.hh: Likewise. + * oln/topo/combinatorial-map/internal/beta.hh: Likewise. + * oln/topo/combinatorial-map/internal/lambda.hh: Likewise. + * oln/topo/combinatorial-map/internal/level.hh: Likewise. + * oln/topo/combinatorial-map/internal/sigma.hh : Likewise. 2004-03-13 Niels Van Vliet <niels@lrde.epita.fr> - * olena/oln/utils/copy.hh: Add comments. - * olena/oln/utils/histogram.hh: Likewise. - * olena/oln/utils/stat.hh: Likewise. - * olena/oln/utils/timer.hh: Likewise. - * olena/oln/utils/special_points.hh: Likewise. + + * oln/utils/copy.hh: Add comments. + * oln/utils/histogram.hh: Likewise. + * oln/utils/stat.hh: Likewise. + * oln/utils/timer.hh: Likewise. + * oln/utils/special_points.hh: Likewise. 2004-03-13 Niels Van Vliet <niels@lrde.epita.fr> - * olena/oln/arith/internal/opdecls.hh: Add comments. - * olena/oln/arith/logic.hh: Likewise. - * olena/oln/arith/ops.hh: Likewise. - * olena/oln/math/macros.hh: Likewise. - * olena/oln/config/pconf-hh.in: Likewise. + + * oln/arith/internal/opdecls.hh: Add comments. + * oln/arith/logic.hh: Likewise. + * oln/arith/ops.hh: Likewise. + * oln/math/macros.hh: Likewise. + * oln/config/pconf-hh.in: Likewise. 2004-03-13 Niels Van Vliet <niels@lrde.epita.fr> - * olena/oln/convert/basics.hh: Add comments. - * olena/oln/convert/bound.hh: Likewise. - * olena/oln/convert/abstract/colorconv.hh: Likewise. - * olena/oln/convert/conversion.hh: Likewise. - * olena/oln/convert/conversion_ng_se.hh: Likewise. - * olena/oln/convert/force.hh: Likewise. - * olena/oln/convert/nrgbxyz.hh: Likewise. - * olena/oln/convert/rgbnrgb.hh: Likewise. - * olena/oln/convert/rgbxyz.hh: Likewise. - * olena/oln/convert/abstract/conversion.hh: Likewise. - * olena/oln/convert/cast.hh: Likewise. - * olena/oln/convert/rgbhsv.hh: Likewise. - * olena/oln/convert/rgbhsl.hh: Likewise. - * olena/oln/convert/rgbhsi.hh: Likewise. - * olena/oln/convert/rgbyuv.hh: Likewise. - * olena/oln/convert/rgbyiq.hh: Likewise. - * olena/oln/convert/value_to_point.hh: Likewise. - * olena/oln/convert/stretch.hh: Fix bug. + + * oln/convert/basics.hh: Add comments. + * oln/convert/bound.hh: Likewise. + * oln/convert/abstract/colorconv.hh: Likewise. + * oln/convert/conversion.hh: Likewise. + * oln/convert/conversion_ng_se.hh: Likewise. + * oln/convert/force.hh: Likewise. + * oln/convert/nrgbxyz.hh: Likewise. + * oln/convert/rgbnrgb.hh: Likewise. + * oln/convert/rgbxyz.hh: Likewise. + * oln/convert/abstract/conversion.hh: Likewise. + * oln/convert/cast.hh: Likewise. + * oln/convert/rgbhsv.hh: Likewise. + * oln/convert/rgbhsl.hh: Likewise. + * oln/convert/rgbhsi.hh: Likewise. + * oln/convert/rgbyuv.hh: Likewise. + * oln/convert/rgbyiq.hh: Likewise. + * oln/convert/value_to_point.hh: Likewise. + * oln/convert/stretch.hh: Fix bug. 2004-03-13 Niels Van Vliet <niels@lrde.epita.fr> - * olena/oln/convert/stretch.hh: Add stretch_balance. Add comments. + + * oln/convert/stretch.hh: Add stretch_balance. Add comments. 2004-03-12 Damien Thivolle <damien@lrde.epita.fr> - * olena/oln/core/accum.hh: Add comments. - * olena/oln/core/apply.hh: Likewise. - * olena/oln/core/compose.hh: Likewise. - * olena/oln/core/coord.hh: Likewise. - * olena/oln/core/dpoint1d.hh: Likewise. - * olena/oln/core/dpoint2d.hh: Likewise. - * olena/oln/core/dpoint3d.hh: Likewise. - * olena/oln/core/fold.hh: Likewise. - * olena/oln/core/image1d.hh: Likewise. - * olena/oln/core/image1d_size.hh: Likewise. - * olena/oln/core/image2d.hh: Likewise. - * olena/oln/core/image2d_size.hh: Likewise. - * olena/oln/core/image3d.hh: Likewise. - * olena/oln/core/image3d_size.hh: Likewise. - * olena/oln/core/image.hh: Likewise. - * olena/oln/core/point1d.hh: Likewise. - * olena/oln/core/point2d.hh: Likewise. - * olena/oln/core/point3d.hh: Likewise. - * olena/oln/core/traverse.hh: Likewise. - * olena/oln/core/abstract/image.hh: Correct comments. - * olena/oln/core/impl/image_impl.hh: Add comments. - * olena/oln/core/impl/image_array.hh: Likewise. - * olena/oln/core/impl/image_array3d.hh: Likewise. - * olena/oln/core/impl/image_array2d.hh: Likewise. - * olena/oln/core/impl/image_array1d.hh: Likewise. - * olena/oln/core/behavior.hh: Likewise. + * oln/core/accum.hh: Add comments. + * oln/core/apply.hh: Likewise. + * oln/core/compose.hh: Likewise. + * oln/core/coord.hh: Likewise. + * oln/core/dpoint1d.hh: Likewise. + * oln/core/dpoint2d.hh: Likewise. + * oln/core/dpoint3d.hh: Likewise. + * oln/core/fold.hh: Likewise. + * oln/core/image1d.hh: Likewise. + * oln/core/image1d_size.hh: Likewise. + * oln/core/image2d.hh: Likewise. + * oln/core/image2d_size.hh: Likewise. + * oln/core/image3d.hh: Likewise. + * oln/core/image3d_size.hh: Likewise. + * oln/core/image.hh: Likewise. + * oln/core/point1d.hh: Likewise. + * oln/core/point2d.hh: Likewise. + * oln/core/point3d.hh: Likewise. + * oln/core/traverse.hh: Likewise. + * oln/core/abstract/image.hh: Correct comments. + * oln/core/impl/image_impl.hh: Add comments. + * oln/core/impl/image_array.hh: Likewise. + * oln/core/impl/image_array3d.hh: Likewise. + * oln/core/impl/image_array2d.hh: Likewise. + * oln/core/impl/image_array1d.hh: Likewise. + * oln/core/behavior.hh: Likewise. 2004-03-12 Simon Odou <simon@lrde.epita.fr> - * olena/oln/core/bkd_iter1d.hh: Correct comments. - * olena/oln/core/bkd_iter2d.hh: Likewise. - * olena/oln/core/bkd_iter3d.hh: Likewise. - * olena/oln/core/fwd_iter1d.hh: Likewise. - * olena/oln/core/fwd_iter2d.hh: Likewise. - * olena/oln/core/fwd_iter3d.hh: Likewise. - * olena/oln/core/abstract/iter1d.hh: Likewise. - * olena/oln/core/abstract/iter2d.hh: Likewise. - * olena/oln/core/abstract/iter3d.hh: Likewise. - * olena/oln/core/abstract/iter.hh: Likewise. - * olena/oln/core/neighborhood1d.hh: Likewise. - * olena/oln/core/neighborhood2d.hh: Likewise. - * olena/oln/core/neighborhood3d.hh: Likewise. - * olena/oln/core/abstract/neighborhood.hh: Likewise. - * olena/oln/core/abstract/struct_elt.hh: Likewise. - * olena/oln/core/window1d.hh: Likewise. - * olena/oln/core/window2d.hh: Likewise. - * olena/oln/core/window3d.hh: Likewise. - * olena/oln/core/abstract/window.hh: Likewise. - * olena/oln/core/w_window1d.hh: Likewise. - * olena/oln/core/w_window2d.hh: Likewise. - * olena/oln/core/w_window3d.hh: Likewise. - * olena/oln/core/abstract/w_window.hh: Likewise. - * olena/oln/core/abstract/image.hh: Likewise. - * olena/oln/core/abstract/window_base.hh: Likewise. - * olena/oln/core/abstract/windownd.hh: Likewise. - * olena/oln/core/abstract/w_windownd.hh: Likewise. - * olena/oln/core/abstract/neighborhoodnd.hh: Likewise. + * oln/core/bkd_iter1d.hh: Correct comments. + * oln/core/bkd_iter2d.hh: Likewise. + * oln/core/bkd_iter3d.hh: Likewise. + * oln/core/fwd_iter1d.hh: Likewise. + * oln/core/fwd_iter2d.hh: Likewise. + * oln/core/fwd_iter3d.hh: Likewise. + * oln/core/abstract/iter1d.hh: Likewise. + * oln/core/abstract/iter2d.hh: Likewise. + * oln/core/abstract/iter3d.hh: Likewise. + * oln/core/abstract/iter.hh: Likewise. + * oln/core/neighborhood1d.hh: Likewise. + * oln/core/neighborhood2d.hh: Likewise. + * oln/core/neighborhood3d.hh: Likewise. + * oln/core/abstract/neighborhood.hh: Likewise. + * oln/core/abstract/struct_elt.hh: Likewise. + * oln/core/window1d.hh: Likewise. + * oln/core/window2d.hh: Likewise. + * oln/core/window3d.hh: Likewise. + * oln/core/abstract/window.hh: Likewise. + * oln/core/w_window1d.hh: Likewise. + * oln/core/w_window2d.hh: Likewise. + * oln/core/w_window3d.hh: Likewise. + * oln/core/abstract/w_window.hh: Likewise. + * oln/core/abstract/image.hh: Likewise. + * oln/core/abstract/window_base.hh: Likewise. + * oln/core/abstract/windownd.hh: Likewise. + * oln/core/abstract/w_windownd.hh: Likewise. + * oln/core/abstract/neighborhoodnd.hh: Likewise. 2004-03-12 Giovanni Palma <giovanni@lrde.epita.fr> @@ -1222,44 +1330,45 @@ * oln/morpho/watershed.hxx: Likewise. 2004-03-11 Damien Thivolle <damien@lrde.epita.fr> - * olena/oln/core/abstract/image.hh: Add comments. - * olena/oln/core/abstract/image_with_dim.hh: Correct comments. + * oln/core/abstract/image.hh: Add comments. + * oln/core/abstract/image_with_dim.hh: Correct comments. 2004-03-11 Simon Odou <simon@lrde.epita.fr> - * olena/oln/core/abstract/image.hh: Add same macros without the + * oln/core/abstract/image.hh: Add same macros without the 'template' keyword. 2004-03-11 Damien Thivolle <damien@lrde.epita.fr> - * olena/oln/core/abstract/dpoint.hh: Add comments. - * olena/oln/core/abstract/image_size.hh: Add comments. - * olena/oln/core/abstract/point.hh: Add comments. - * olena/oln/core/abstract/image.hh: Add comments. - * olena/oln/core/abstract/image_with_dim.hh: Add comments. - * olena/oln/core/abstract/image_with_impl.hh: Add comments. - * olena/oln/core/abstract/image_with_type.hh: Add comments. - * olena/oln/core/abstract/image_with_type_with_dim.hh: Add comments. - * olena/oln/core/abstract/behavior.hh: Add comments. + * oln/core/abstract/dpoint.hh: Add comments. + * oln/core/abstract/image_size.hh: Add comments. + * oln/core/abstract/point.hh: Add comments. + * oln/core/abstract/image.hh: Add comments. + * oln/core/abstract/image_with_dim.hh: Add comments. + * oln/core/abstract/image_with_impl.hh: Add comments. + * oln/core/abstract/image_with_type.hh: Add comments. + * oln/core/abstract/image_with_type_with_dim.hh: Add comments. + * oln/core/abstract/behavior.hh: Add comments. 2004-03-10 Niels Van Vliet <niels@lrde.epita.fr> - * olena/oln/level/compare.hh: Add comments. - * olena/oln/level/connected.hh: Add comments. - * olena/oln/level/fill.hh: Add comments. - * olena/oln/level/invert.hh: Add comments. - * olena/oln/level/lut.hh: Add comments. - * olena/oln/level/set_level.hh: Add comments. - * olena/oln/level/threshold.hh: Add comments. + + * oln/level/compare.hh: Add comments. + * oln/level/connected.hh: Add comments. + * oln/level/fill.hh: Add comments. + * oln/level/invert.hh: Add comments. + * oln/level/lut.hh: Add comments. + * oln/level/set_level.hh: Add comments. + * oln/level/threshold.hh: Add comments. 2004-03-10 Niels Van Vliet <niels@lrde.epita.fr> - * olena/oln/snakes/snakes_base.hh: Add comments. - * olena/oln/snakes/energies.hh: Add comments. - * olena/oln/snakes/greedy.hh: Add comments. - * olena/oln/snakes/node.hh: Add comments. - * olena/oln/snakes/segment.hh: Add comments. - * olena/oln/snakes/snakes_base.hh: Add comments. - * olena/oln/morpho/attribute_closing_opening.hh: Fix bug in doc. - * olena/oln/morpho/attribute_closing_opening_map.hh: Fix bug in doc. + * oln/snakes/snakes_base.hh: Add comments. + * oln/snakes/energies.hh: Add comments. + * oln/snakes/greedy.hh: Add comments. + * oln/snakes/node.hh: Add comments. + * oln/snakes/segment.hh: Add comments. + * oln/snakes/snakes_base.hh: Add comments. + * oln/morpho/attribute_closing_opening.hh: Fix bug in doc. + * oln/morpho/attribute_closing_opening_map.hh: Fix bug in doc. 2004-03-10 Giovanni Palma <giovanni@lrde.epita.fr> @@ -1279,7 +1388,8 @@ * tests/morpho/tests/attr_op_cl: Change tests to make them taking care of new attribute names. - * oln/morpho/attribute_closing_opening_map.hh: Change some function names. + * oln/morpho/attribute_closing_opening_map.hh: Change some + function names. * oln/morpho/attributes.hh: Rename some attributes. Add new ones. * oln/Makefile.am: Add file references. * oln/morpho/attribute_union_find.hh: Remove old attribute class. @@ -1837,7 +1947,7 @@ * oln/core/abstract/image_with_impl.hh: ...here. - * olena/oln/core/image.hh: Fix constructors. + * oln/core/image.hh: Fix constructors. * tests/core/tests/image2: Adapt and fix. @@ -1950,26 +2060,26 @@ * oln/utils/histogram.hh: Check if the given data type is valid. * oln/morpho/closing.inc: Take non_vectorial_image instead of image. - * oln/morpho/dilation.hh: Likewise. - * oln/morpho/erosion.hh: Likewise. - * oln/morpho/extrema.hxx: Likewise. - * oln/morpho/extrema_killer.hh: Likewise. - * oln/morpho/fast_morpho.hh: Likewise. - * oln/morpho/fast_morpho.hxx: Likewise. - * oln/morpho/geodesic_dilation.hh: Likewise. - * oln/morpho/geodesic_erosion.hh: Likewise. - * oln/morpho/gradient.inc: Likewise. - * oln/morpho/hit_or_miss.inc: Likewise. - * oln/morpho/laplacian.inc: Likewise. - * oln/morpho/opening.inc: Likewise. - * oln/morpho/reconstruction.hh: Likewise. - * oln/morpho/stat.hh: Likewise. - * oln/morpho/thickening.inc: Likewise. - * oln/morpho/thinning.inc: Likewise. - * oln/morpho/top_hat.inc: Likewise. - * oln/morpho/watershed.hh: Likewise. - * oln/morpho/watershed.hxx: Likewise. - * oln/morpho/attribute_closing_opening.hh: Likewise. + * oln/morpho/dilation.hh: Likewise. + * oln/morpho/erosion.hh: Likewise. + * oln/morpho/extrema.hxx: Likewise. + * oln/morpho/extrema_killer.hh: Likewise. + * oln/morpho/fast_morpho.hh: Likewise. + * oln/morpho/fast_morpho.hxx: Likewise. + * oln/morpho/geodesic_dilation.hh: Likewise. + * oln/morpho/geodesic_erosion.hh: Likewise. + * oln/morpho/gradient.inc: Likewise. + * oln/morpho/hit_or_miss.inc: Likewise. + * oln/morpho/laplacian.inc: Likewise. + * oln/morpho/opening.inc: Likewise. + * oln/morpho/reconstruction.hh: Likewise. + * oln/morpho/stat.hh: Likewise. + * oln/morpho/thickening.inc: Likewise. + * oln/morpho/thinning.inc: Likewise. + * oln/morpho/top_hat.inc: Likewise. + * oln/morpho/watershed.hh: Likewise. + * oln/morpho/watershed.hxx: Likewise. + * oln/morpho/attribute_closing_opening.hh: Likewise. 2003-08-03 Nicolas Burrus <burrus_n@lrde.epita.fr> @@ -2342,43 +2452,43 @@ 2003-07-30 Nicolas Burrus <burrus_n@lrde.epita.fr> - * oln/arith/ops.hh: Fix compilation with g++ 3.4. - * oln/core/abstract/dpoint.hh: Likewise. - * oln/core/image1d.hh: Likewise. - * oln/core/image2d.hh: Likewise. - * oln/core/image3d.hh: Likewise. - * oln/core/abstract/iter1d.hh: Likewise. - * oln/core/abstract/iter2d.hh: Likewise. - * oln/core/abstract/iter3d.hh: Likewise. - * oln/core/abstract/iter.hh: Likewise. - * oln/core/neighborhood1d.hh: Likewise. - * oln/core/neighborhood2d.hh: Likewise. - * oln/core/neighborhood3d.hh: Likewise. - * oln/core/abstract/neighborhood.hh: Likewise. - * oln/core/abstract/point.hh: Likewise. - * oln/core/abstract/struct_elt.hh: Likewise. - * oln/core/window1d.hh: Likewise. - * oln/core/window2d.hh: Likewise. - * oln/core/window3d.hh: Likewise. - * oln/core/abstract/window.hh: Likewise. - * oln/core/w_window1d.hh: Likewise. - * oln/core/w_window2d.hh: Likewise. - * oln/core/w_window3d.hh: Likewise. - * oln/core/abstract/w_window.hh: Likewise. - * oln/level/invert.hh: Likewise. - * oln/morpho/erosion.hh: Likewise. - * tests/morpho/extrkiller.cc: Likewise. - * oln/topo/inter-pixel/internal/dir-iter.hh: Likewise. - * oln/core/abstract/image.hh: Likewise. - * oln/core/abstract/image_with_dim.hh: Likewise. - * oln/core/abstract/image_with_impl.hh: Likewise. - * oln/core/abstract/image_with_type.hh: Likewise. - * oln/core/impl/image_impl.hh: Likewise. - * oln/core/impl/image_array.hh: Likewise. - * oln/core/abstract/window_base.hh: Likewise. - * oln/core/abstract/windownd.hh: Likewise. - * oln/core/abstract/w_windownd.hh: Likewise. - * oln/core/abstract/neighborhoodnd.hh: Likewise. + * oln/arith/ops.hh: Fix compilation with g++ 3.4. + * oln/core/abstract/dpoint.hh: Likewise. + * oln/core/image1d.hh: Likewise. + * oln/core/image2d.hh: Likewise. + * oln/core/image3d.hh: Likewise. + * oln/core/abstract/iter1d.hh: Likewise. + * oln/core/abstract/iter2d.hh: Likewise. + * oln/core/abstract/iter3d.hh: Likewise. + * oln/core/abstract/iter.hh: Likewise. + * oln/core/neighborhood1d.hh: Likewise. + * oln/core/neighborhood2d.hh: Likewise. + * oln/core/neighborhood3d.hh: Likewise. + * oln/core/abstract/neighborhood.hh: Likewise. + * oln/core/abstract/point.hh: Likewise. + * oln/core/abstract/struct_elt.hh: Likewise. + * oln/core/window1d.hh: Likewise. + * oln/core/window2d.hh: Likewise. + * oln/core/window3d.hh: Likewise. + * oln/core/abstract/window.hh: Likewise. + * oln/core/w_window1d.hh: Likewise. + * oln/core/w_window2d.hh: Likewise. + * oln/core/w_window3d.hh: Likewise. + * oln/core/abstract/w_window.hh: Likewise. + * oln/level/invert.hh: Likewise. + * oln/morpho/erosion.hh: Likewise. + * tests/morpho/extrkiller.cc: Likewise. + * oln/topo/inter-pixel/internal/dir-iter.hh: Likewise. + * oln/core/abstract/image.hh: Likewise. + * oln/core/abstract/image_with_dim.hh: Likewise. + * oln/core/abstract/image_with_impl.hh: Likewise. + * oln/core/abstract/image_with_type.hh: Likewise. + * oln/core/impl/image_impl.hh: Likewise. + * oln/core/impl/image_array.hh: Likewise. + * oln/core/abstract/window_base.hh: Likewise. + * oln/core/abstract/windownd.hh: Likewise. + * oln/core/abstract/w_windownd.hh: Likewise. + * oln/core/abstract/neighborhoodnd.hh: Likewise. 2003-07-30 Nicolas Burrus <burrus_n@lrde.epita.fr> @@ -3481,7 +3591,7 @@ 2003-03-12 Nicolas Burrus <burrus_n@lrde.epita.fr> * tests/check/Makefile.flags, tests/sanity/Makefile.am: Remove - useless flags. + useless flags. * Makefile.am: Adjust consequently. @@ -3569,7 +3679,7 @@ * oln/Makefile.am (nobase_oln_HEADERS): Adjust. * oln/morpho/attribute_union_find.hh: Fix includes and - namespaces. + namespaces. 2003-03-07 Nicolas Burrus <burrus_n@lrde.epita.fr> @@ -4183,7 +4293,8 @@ * configure.ac: Merge tests/configure.ac. Use AC_CONFIG_FILES instead of AC_CONFIG_HEADERS for pconf.inc. - * tests/defs.in (CXXFLAGS): Remove warning options (added by "configure") + * tests/defs.in (CXXFLAGS): Remove warning options (added by + "configure") * tests/Makefile.am (SUBDIRS): Correct @OLN_TESTS_SUBDIRS@ to $(OLN_TESTS_SUBDIRS). Add comments. @@ -4268,7 +4379,7 @@ * oln/core/point3d.hh: Add dpoint3d typedef. * oln/core/point.hh: Minor change. * oln/meta/basics.hh: Add an 'undefined' class for static - error reporting. + error reporting. * oln/core/box.hh: - Parameter is changed to 'PointType'. - (overlay): New. @@ -4447,29 +4558,29 @@ 2002-12-26 Reda Dehak <reda@nemours.epita.fr> - * oln/convol/convolution.hh: Fix include files. - * tests/convol/slow_sum_2d_1.cc: Change accordingly. - * tests/convol/slow_sum_2d_2.cc: Change accordingly. - * tests/convol/sobel_gradient.cc: Change accordingly. + * oln/convol/convolution.hh: Fix include files. + * tests/convol/slow_sum_2d_1.cc: Change accordingly. + * tests/convol/slow_sum_2d_2.cc: Change accordingly. + * tests/convol/sobel_gradient.cc: Change accordingly. 2002-12-11 Quoc Peyrot <chojin@lrde.epita.fr> - * oln/Makefile.am (nobase_oln_HEADERS): Add morpho/extrema.hxx. - move level/extrema_killer.hh to morpho/extrema_killer.hh. + * oln/Makefile.am (nobase_oln_HEADERS): Add morpho/extrema.hxx. + move level/extrema_killer.hh to morpho/extrema_killer.hh. - * oln/morpho/extrema_killer.hh: Change namespace. - * demo/test-reconstruction.cc: Change accordingly. + * oln/morpho/extrema_killer.hh: Change namespace. + * demo/test-reconstruction.cc: Change accordingly. 2002-12-11 Reda Dehak <reda@lrde.epita.fr> - * oln/convol/convolution.hh: Fix convolve function. - * test/convol/slow_sum_2d_1.hh: Modify accordingly. - * test/convol/slow_sum_2d_2.hh: Modify accordingly. - * test/convol/sobel_gradient.hh: Modify accordingly. + * oln/convol/convolution.hh: Fix convolve function. + * test/convol/slow_sum_2d_1.hh: Modify accordingly. + * test/convol/slow_sum_2d_2.hh: Modify accordingly. + * test/convol/sobel_gradient.hh: Modify accordingly. 2002-12-11 Quoc Peyrot <chojin@lrde.epita.fr> - * Branch for olena 0.6 stable + * Branch for olena 0.6 stable (End of changes from 0.6) Index: 10.246/tools/swilena/ChangeLog --- 10.246/tools/swilena/ChangeLog Thu, 13 Jul 2006 16:20:10 +0200 levill_r (oln/n/37_ChangeLog 1.7.1.47 600) +++ 10.246(w)/tools/swilena/ChangeLog Mon, 21 Aug 2006 17:06:57 +0200 theo (oln/n/37_ChangeLog 1.7.1.48 600) @@ -15,11 +15,11 @@ Complete Rblena test suite. * ruby/tests/arith.rb, ruby/tests/conversions.rb, - * ruby/tests/morpho.rb: New tests + * ruby/tests/morpho.rb: New tests * ruby/tests/Makefile.am (dist_noinst_DATA): Add arith.rb, conversions.rb and morpho.rb. - * python/tests/conversions.py, python/tests/morpho.py: + * python/tests/conversions.py, python/tests/morpho.py: * python/tests/simple1.py: Reduce the number of imported modules. * python/tests/Makefile.am, python/tests/arith.py, * python/tests/sanity.py, ruby/tests/conversions.rb, Index: 10.246/olena/oln/lrde/ufmt/bin/basic_salembier.cc --- 10.246/olena/oln/lrde/ufmt/bin/basic_salembier.cc Thu, 03 Aug 2006 16:06:43 +0200 theo (oln/x/1_basic_sale 1.1 644) +++ 10.246(w)/olena/oln/lrde/ufmt/bin/basic_salembier.cc Mon, 21 Aug 2006 16:54:16 +0200 theo (oln/x/1_basic_sale 1.1 644) @@ -27,13 +27,18 @@ image_t input = load(argv[1]); int c = atoi(argv[2]); - if (not (c == 4 or c == 8)) + if (not (c == 2 or c == 4 or c == 8)) usage(argv); typedef lrde::ufmt::basic_salembier<image_t> algorithm_t; - algorithm_t run(input, - c == 4 ? neighb_c4() : neighb_c8()); + neighborhood2d nbh; + if (c == 2) + nbh.add(dpoint2d(0, 1)); + else + nbh = c == 4 ? neighb_c4() : neighb_c8(); + + algorithm_t run(input, nbh); run.go(); std::cout << "n level roots = " << run.n_level_roots() << std::endl; } Index: 10.246/olena/oln/lrde/ufmt/log.hh --- 10.246/olena/oln/lrde/ufmt/log.hh Thu, 03 Aug 2006 16:06:43 +0200 theo (oln/x/5_log.hh 1.1 644) +++ 10.246(w)/olena/oln/lrde/ufmt/log.hh Fri, 18 Aug 2006 18:30:43 +0200 theo (oln/x/5_log.hh 1.1 644) @@ -28,6 +28,8 @@ #ifndef OLENA_LRDE_UFMT_LOG_HH # define OLENA_LRDE_UFMT_LOG_HH +# include <map> +# include <oln/level/fill.hh> namespace oln @@ -39,6 +41,7 @@ namespace ufmt { + // couting template <class Algo> unsigned n_level_roots(const Algo& algo) @@ -52,6 +55,212 @@ return count; } + template <class Algo> + unsigned n_roots(const Algo& algo) + { + typedef typename Algo::image I; + unsigned count = 0; + oln_iter_type(I) p(algo.f_()); + for_all(p) + if (algo.is_root_(p)) + ++count; + return count; + } + + + + // building images + + template <class Algo> + typename Algo::bin_image_t // e.g., image2d<bool> + level_root_image(const Algo& algo) + { + typedef typename Algo::bin_image_t B; + B lroot(algo.f_().size()); + level::fill(lroot, false); + oln_iter_type(B) p(algo.f_()); + for_all(p) + if (algo.is_level_root_(p)) + lroot[p] = true; + return lroot; + } + + + template <class Algo> + typename Algo::int_u8_image_t + tree_image(const Algo& algo, bool print_counts = false) + { + typedef typename Algo::point point; + enum { + unknown = 0, // temporary label + + // tree root (black) + root = 1, + + // the following labels are for "not tree root" points + + // level roots are: + // - intermediate (red) or + intermediate_level_root = 2, + // - leaf (green) + leaf_level_root = 3, // not root + + // some points belong to a path between a couple of level roots + // (white) + in_between_level_point = 6, + + // otherwise points are: + // - leaf (blue) + leaf_point = 4, + // - intermediate (yellow) + intermediate_point = 5 + }; + + typedef typename Algo::int_u8_image_t T; + T tree(algo.f_().size()); + level::fill(tree, unknown); + + oln_iter_type(T) p(algo.f_()); + + for_all(p) + if (algo.is_root_(p)) + tree[p] = root; + else if (algo.is_level_root_(p)) + tree[p] = leaf_level_root; // but we do not know about 'leaf' + + for_all(p) + if (algo.is_level_root_(p)) + { + point q = p; // from p level root + do + { + q = algo.parent_(q); + if (not algo.is_level_root_(q)) + // we reach a non level root point + tree[q] = in_between_level_point; + } + while (not algo.is_level_root_(q)); + // level root p --> level root q + if (q != p and not algo.is_root_(q)) + tree[q] = intermediate_level_root; // not leaf level root + } + + for_all(p) + { + point par_p = algo.parent_(p); + if (tree[par_p] == unknown) + tree[par_p] = intermediate_point; + } + for_all(p) + if (tree[p] == unknown) + tree[p] = leaf_point; + + // printing + if (print_counts) + { + unsigned + n_roots = 0, + n_intermediate_level_roots = 0, + n_leaf_level_roots = 0, + n_in_between_level_points = 0, + n_leaf_points = 0, + n_intermediate_points = 0; + + for_all(p) + switch (tree[p]) { + case root: + ++n_roots; + break; + case intermediate_level_root: + ++n_intermediate_level_roots; + break; + case leaf_level_root: + ++n_leaf_level_roots; + break; + case in_between_level_point: + ++n_in_between_level_points; + break; + case leaf_point: + ++n_leaf_points; + break; + case intermediate_point: + ++n_intermediate_points; + break; + } + + std::cout << "n roots = " << n_roots << std::endl + << "n intermediate lroots = " << n_intermediate_level_roots << std::endl + << "n leaf lroots = " << n_leaf_level_roots << std::endl + << "n in-between lpoint = " << n_in_between_level_points << std::endl + << "n leaf points = " << n_leaf_points << std::endl + << "n intermediate points = " << n_intermediate_points << std::endl; + + } + + return tree; + } + + + + // comparing images + + template <class I1, class I2> + bool + check_equiv_label_images(const abstract::image<I1>& label1, + const abstract::image<I2>& label2) + { + assert(label1.size() == label2.size()); + std::map<unsigned, unsigned> m; + oln_iter_type(I1) p(label1); + for_all(p) + { + if (m.find(label1[p]) == m.end()) + m[label1[p]] = label2[p]; + else + if (label2[p] != m[label1[p]]) + return false; + } + return true; + } + + + + // invariant checking + + template <class Algo> + bool check_f_par_p_leq_f_p(const Algo& algo) + // f(par(p)) <= f(p) + { + typedef typename Algo::image I; + oln_iter_type(I) p(algo.f_()); + for_all(p) + if (not (algo.f_(algo.parent_(p)) <= algo.f_(p))) + { + std::cerr << "invariant FAILED: f(par(p)) <= f(p)" + << std::endl; + return false; + } + return true; + } + + + + // some tests + + template <class Algo> + bool is_level_compression_completed(const Algo& algo) + { + typedef typename Algo::image I; + oln_iter_type(I) p(algo.f_()); + for_all(p) + if (not is_level_root(algo.parent_(p))) + { + std::cerr << "test FAILED: level compression is NOT completed" + << std::endl; + return false; + } + return true; + } } // end of namespace oln::lrde::ufmt Index: 10.246/olena/oln/lrde/ufmt/ad_maxtree.hh --- 10.246/olena/oln/lrde/ufmt/ai_maxtree.hh Fri, 04 Aug 2006 18:48:35 +0200 theo (oln/x/12_ai_maxtree 1.1 644) +++ 10.246(w)/olena/oln/lrde/ufmt/ad_maxtree.hh Mon, 21 Aug 2006 16:02:45 +0200 theo (oln/x/12_ai_maxtree 1.1 644) @@ -25,16 +25,18 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_LRDE_UFMT_AI_MAXTREE_HH -# define OLENA_LRDE_UFMT_AI_MAXTREE_HH +#ifndef OLENA_LRDE_UFMT_AD_MAXTREE_HH +# define OLENA_LRDE_UFMT_AD_MAXTREE_HH # include <oln/lrde/ufmt/utils.hh> -# define oln_lrde_ufmt_import_ai_maxtree_typedefs \ +# define oln_lrde_ufmt_import_ad_maxtree_typedefs \ typedef typename super::image image; \ typedef typename super::point point; \ typedef typename super::dpoint dpoint; \ + typedef typename super::dparent_t dparent_t; \ + typedef typename super::dpar_t dpar_t; \ typedef typename super::value value @@ -61,7 +63,7 @@ // FIXME: doc. template <class I> - struct ai_maxtree + struct ad_maxtree { typedef I image; typedef int point; @@ -140,16 +142,17 @@ // aux data typedef typename mute<I, int>::ret dparent_t; - dparent_t dpar_; // proxied + typedef indexed_image<dparent_t> dpar_t; - indexed_image<dparent_t> dpar; // proxy + dparent_t dpar_; // proxied + dpar_t dpar; // proxy // input indexed_image<I> f; // ctor - ai_maxtree(const abstract::image<I>& f_) + ad_maxtree(const abstract::image<I>& f_) : dpar_(f_.size()) { @@ -227,7 +230,7 @@ - }; // end of class ai_maxtree + }; // end of class ad_maxtree @@ -238,4 +241,4 @@ } // end of namespace oln -#endif // ! OLENA_LRDE_UFMT_AI_MAXTREE_HH +#endif // ! OLENA_LRDE_UFMT_AD_MAXTREE_HH Index: 10.246/olena/oln/lrde/ufmt/hdc_maxtree.hh --- 10.246/olena/oln/lrde/ufmt/si_maxtree.hh Fri, 04 Aug 2006 18:48:35 +0200 theo (oln/x/13_si_maxtree 1.1 644) +++ 10.246(w)/olena/oln/lrde/ufmt/hdc_maxtree.hh Mon, 21 Aug 2006 16:14:42 +0200 theo (oln/x/13_si_maxtree 1.1 644) @@ -25,12 +25,13 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_LRDE_UFMT_SI_MAXTREE_HH -# define OLENA_LRDE_UFMT_SI_MAXTREE_HH +#ifndef OLENA_LRDE_UFMT_HDC_MAXTREE_HH +# define OLENA_LRDE_UFMT_HDC_MAXTREE_HH # include <oln/level/fill.hh> # include <oln/lrde/ufmt/utils.hh> -# include <oln/lrde/ufmt/ai_maxtree.hh> +# include <oln/lrde/ufmt/ad_maxtree.hh> +# include <oln/lrde/ufmt/attributes.hh> @@ -62,12 +63,12 @@ // FIXME: doc. template <class I> - struct si_maxtree : public ai_maxtree<I> + struct hdc_maxtree : public ad_maxtree<I> { - typedef ai_maxtree<I> super; + typedef ad_maxtree<I> super; using super::f; using super::dpar; - oln_lrde_ufmt_import_ai_maxtree_typedefs; + oln_lrde_ufmt_import_ad_maxtree_typedefs; const oln_neighborhood_type(I)& nbh; @@ -82,7 +83,7 @@ // ctor - si_maxtree(const abstract::image<I>& f, + hdc_maxtree(const abstract::image<I>& f, const oln_neighborhood_type(I)& nbh) : super(f), @@ -90,11 +91,12 @@ { } + template <class A> // void if no attributes void go() { init(); compute_parent(); // 1st pass - extract_maxtree(); // 2nd pass + extract_maxtree<A>(); // 2nd pass } void init() @@ -150,11 +152,57 @@ } // end of "for all h" } - void extract_maxtree() + + template <class A> // A for attributes + std::vector< node_<A> > + extract_maxtree() + { + std::vector< node_<A> > node(nnodes); + dpar_t& label = dpar; + + // bkd + unsigned cur_l = nnodes - 1; + for (int i = S.size() - 1; i != 0; --i) + { + point p = S[i]; + assert(is_level_root(p + dpar[p])); // level compression is total + if (is_level_root(p)) + { + // node initialization + point par_p = p + dpar[p]; // this value is saved + label[p] = cur_l; // because dpar[p] is modified here + node[cur_l].par = label[par_p]; // so this line is ok + if (is_root(p)) + assert(node[cur_l].par == cur_l); + --cur_l; + } + else + // label propagation + label[p] = label[p + dpar[p]]; + } + return node; + } + + + template <class A> // A for attributes + void compute_attributes(std::vector< node_<A> >& node) + // point-wise version { - // FIXME: TODO + dpar_t& label = dpar; + for (int i = S.size() - 1; i != 0; --i) + { + point p = S[i]; + if (is_level_root(p)) + node[label[p]].init(f, p); + else + node[label[p]].insert(f, p); + } + for (int l = 0; l < nnodes; ++l) + if (node[l].par != l) // not root node + node[node[l].par].embrace(node[l]); } + point find_root(point x, value h) { while (not is_root(x)) @@ -173,7 +221,7 @@ } - }; // end of class si_maxtree + }; // end of class hdc_maxtree @@ -184,4 +232,4 @@ } // end of namespace oln -#endif // ! OLENA_LRDE_UFMT_SI_MAXTREE_HH +#endif // ! OLENA_LRDE_UFMT_HDC_MAXTREE_HH Index: 10.246/olena/oln/lrde/ufmt/rpc_maxtree.hh --- 10.246/olena/oln/lrde/ufmt/rup_maxtree.hh Fri, 04 Aug 2006 18:48:35 +0200 theo (oln/x/14_rup_maxtre 1.1 644) +++ 10.246(w)/olena/oln/lrde/ufmt/rpc_maxtree.hh Mon, 21 Aug 2006 15:58:38 +0200 theo (oln/x/14_rup_maxtre 1.1 644) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_LRDE_UFMT_RUP_MAXTREE_HH -# define OLENA_LRDE_UFMT_RUP_MAXTREE_HH +#ifndef OLENA_LRDE_UFMT_RPC_MAXTREE_HH +# define OLENA_LRDE_UFMT_RPC_MAXTREE_HH # include <oln/lrde/ufmt/utils.hh> # include <oln/lrde/ufmt/ap_maxtree.hh> @@ -46,7 +46,7 @@ // FIXME: doc. template <class I> - struct rup_maxtree : public ap_maxtree<I> + struct rpc_maxtree : public ap_maxtree<I> { typedef ap_maxtree<I> super; using super::f; @@ -61,7 +61,7 @@ // ctor - rup_maxtree(const abstract::image<I>& f, + rpc_maxtree(const abstract::image<I>& f, const oln_neighborhood_type(I)& nbh) : super(f, nbh) @@ -206,7 +206,7 @@ } - }; // end of class rup_maxtree + }; // end of class rpc_maxtree @@ -217,4 +217,4 @@ } // end of namespace oln -#endif // ! OLENA_LRDE_UFMT_RUP_MAXTREE_HH +#endif // ! OLENA_LRDE_UFMT_RPC_MAXTREE_HH Index: 10.246/olena/oln/lrde/ufmt/hpc_maxtree.hh --- 10.246/olena/oln/lrde/ufmt/sp_maxtree.hh Fri, 04 Aug 2006 18:48:35 +0200 theo (oln/x/15_sp_maxtree 1.1 644) +++ 10.246(w)/olena/oln/lrde/ufmt/hpc_maxtree.hh Mon, 21 Aug 2006 15:36:45 +0200 theo (oln/x/15_sp_maxtree 1.1 644) @@ -25,12 +25,13 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_LRDE_UFMT_SP_MAXTREE_HH -# define OLENA_LRDE_UFMT_SP_MAXTREE_HH +#ifndef OLENA_LRDE_UFMT_HPC_MAXTREE_HH +# define OLENA_LRDE_UFMT_HPC_MAXTREE_HH # include <oln/level/fill.hh> # include <oln/lrde/ufmt/utils.hh> # include <oln/lrde/ufmt/ap_maxtree.hh> +# include <oln/lrde/ufmt/attributes.hh> @@ -43,11 +44,10 @@ namespace ufmt { - // FIXME: doc. template <class I> - struct sp_maxtree : public ap_maxtree<I> + struct hpc_maxtree : public ap_maxtree<I> { typedef ap_maxtree<I> super; using super::f; @@ -61,22 +61,25 @@ std::vector<dpoint> dp_pre, dp_post; unsigned nb; unsigned nnodes; + typename mute<I, unsigned>::ret label; // ctor - sp_maxtree(const abstract::image<I>& f, + hpc_maxtree(const abstract::image<I>& f, const oln_neighborhood_type(I)& nbh) : - super(f, nbh) + super(f, nbh), + label(f.size()) { } + template <class A> // void if no attributes void go() { init(); compute_parent(); // 1st pass - extract_maxtree(); // 2nd pass + extract_maxtree<A>(); // 2nd pass } void init() @@ -88,39 +91,42 @@ void compute_parent() { - int ip = 0; + int i = 0; for (int h = uint_nvalues(f) - 1; h >= 0; --h) { - int ip_first = ip; - int ip_last = ip + H[h]; + int i_first = i; + int i_last = i_first + H[h]; // union-find - for (ip = ip_first; ip < ip_last; ++ip) + for (i = i_first; i < i_last; ++i) { - point p = S[ip]; + point p = S[i]; make_set(p); // pre - for (unsigned i = 0; i < nb; ++i) + for (unsigned j = 0; j < nb; ++j) { - point n = p + dp_pre[i]; + point n = p + dp_pre[j]; if (f.hold(n) and f[n] >= h) do_union(n, p, h); } // post - for (unsigned i = 0; i < nb; ++i) + for (unsigned j = 0; j < nb; ++j) { - point n = p + dp_post[i]; + point n = p + dp_post[j]; if (f.hold(n) and f[n] > h) do_union(n, p, h); } } - // finalizing level compression - - for (int i = ip_last - 1; i >= ip_first; --i) + // enhancing level compression: + // we compress within 'level h' but we can end up with: + // p' @ h+ --> p @ h --> lr @ h + // so we have p -> lr for all p at level h + // but p' --> p cannot be compressed by the code below + for (int k = i_last - 1; k >= i_first; --k) { - point p = S[i]; + point p = S[k]; if (is_root(p)) ++nnodes; else @@ -130,9 +136,94 @@ } // end of "for all h" } - void extract_maxtree() + + template <class A> // A for attributes + std::vector< node_<A> > + extract_maxtree() + { + std::vector< node_<A> > node(nnodes); + + // bkd + unsigned cur_l = nnodes - 1; + for (int i = S.size() - 1; i != 0; --i) + { + point p = S[i]; + + // nota: level compression is not completed here; + // however, though it is useless to finalize it, the + // code to perform completion is given but commented + if (is_level_root(p)) + { + /* + // completing level compression: + + if (not is_level_root(par[p])) + { + // Cf. above comments; here we have + // p @ h+ --> par[p] @ h --> lr @ h + if (not is_root(p)) + { + assert(f[p] > f[par[p]]); + assert(f[par[p]] == f[par[par[p]]]); + assert(is_level_root(par[par[p]])); + } + par[p] = par[par[p]]; + } + // now the level compression is completed! + assert(is_level_root(par[p])); + */ + + // node initialization + label[p] = cur_l; + node[cur_l].par = label[par[p]]; + --cur_l; + } + else + // label propagation + label[p] = label[par[p]]; + } + return node; + } + + + template <class A> // A for attributes + void compute_attributes(std::vector< node_<A> >& node) + // point-wise version + { + for (int i = S.size() - 1; i != 0; --i) + { + point p = S[i]; + if (is_level_root(p)) + node[label[p]].init(f, p); + else + node[label[p]].insert(f, p); + } + for (int l = 0; l < nnodes; ++l) + if (node[l].par != l) // not root node + node[node[l].par].embrace(node[l]); + } + + void make_set(const point& x) + { + par[x] = x; + } + + bool is_root(const point& x) const + { + return par[x] == x; + } + + bool is_level_root(const point& x) const + { + return is_root(x) or f[par[x]] < f[x]; + } + + point find_level_root(const point& x) { - // FIXME: TODO + if (is_level_root(x)) + return x; + else + return par[x] = find_level_root(par[x]); } point find_root(point x, value h) @@ -153,7 +244,7 @@ } - }; // end of class sp_maxtree + }; // end of class hpc_maxtree @@ -164,4 +255,4 @@ } // end of namespace oln -#endif // ! OLENA_LRDE_UFMT_SP_MAXTREE_HH +#endif // ! OLENA_LRDE_UFMT_HPC_MAXTREE_HH Index: 10.246/olena/oln/lrde/ufmt/ap_maxtree.hh --- 10.246/olena/oln/lrde/ufmt/ap_maxtree.hh Fri, 04 Aug 2006 18:48:35 +0200 theo (oln/x/16_ap_maxtree 1.1 644) +++ 10.246(w)/olena/oln/lrde/ufmt/ap_maxtree.hh Mon, 07 Aug 2006 11:26:16 +0200 theo (oln/x/16_ap_maxtree 1.1 644) @@ -62,6 +62,10 @@ typedef oln_neighborhood_type(I) Nbh; typedef oln_iter_type(Nbh) niter; + // aux typedefs + typedef typename mute<I, ntg::bin>::ret bin_image_t; + typedef typename mute<I, ntg::int_u8>::ret int_u8_image_t; + // input const I& f; const Nbh& nbh; @@ -121,7 +125,7 @@ // uniformized interface - const point& parent_(const point& p) const { + point parent_(const point& p) const { return par[p]; } const value& f_(const point& p) const { Index: 10.246/olena/oln/lrde/ufmt/r1ic_maxtree.hh --- 10.246/olena/oln/lrde/ufmt/r1_maxtree.hh Fri, 04 Aug 2006 18:48:35 +0200 theo (oln/x/17_r1_maxtree 1.1 644) +++ 10.246(w)/olena/oln/lrde/ufmt/r1ic_maxtree.hh Mon, 21 Aug 2006 16:44:34 +0200 theo (oln/x/17_r1_maxtree 1.1 644) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_LRDE_UFMT_R1_MAXTREE_HH -# define OLENA_LRDE_UFMT_R1_MAXTREE_HH +#ifndef OLENA_LRDE_UFMT_R1IC_MAXTREE_HH +# define OLENA_LRDE_UFMT_R1IC_MAXTREE_HH # include <oln/lrde/ufmt/utils.hh> @@ -45,10 +45,10 @@ // FIXME: doc. template <class I> - struct r1_maxtree + struct r1ic_maxtree { typedef I image; - typedef unsigned point; + typedef point1d point; typedef oln_value_type(I) value; // input @@ -60,7 +60,7 @@ // ctor - r1_maxtree(const abstract::image<I>& f) + r1ic_maxtree(const abstract::image<I>& f) : f(f.exact()), // FIXME: par should NOT be initialized here! (but in "init()") @@ -81,12 +81,13 @@ void compute_parent() { - unsigned p = 0; + oln_iter_type(I) p(f); + p = mlc::begin; make_set(p); - for (p = 1; p < f.npoints(); ++p) + for_all_remaining(p) { make_set(p); - insert(p - 1, p); + insert(p.col() - 1, p); } } @@ -163,7 +164,7 @@ - }; // end of class r1_maxtree + }; // end of class r1ic_maxtree @@ -174,4 +175,4 @@ } // end of namespace oln -#endif // ! OLENA_LRDE_UFMT_R1_MAXTREE_HH +#endif // ! OLENA_LRDE_UFMT_R1IC_MAXTREE_HH Index: 10.246/olena/oln/lrde/ufmt/bin/rpc_maxtree.cc --- 10.246/olena/oln/lrde/ufmt/bin/rup_maxtree.cc Fri, 04 Aug 2006 18:48:35 +0200 theo (oln/x/18_rup_maxtre 1.1 644) +++ 10.246(w)/olena/oln/lrde/ufmt/bin/rpc_maxtree.cc Mon, 21 Aug 2006 15:59:34 +0200 theo (oln/x/18_rup_maxtre 1.1 644) @@ -3,7 +3,7 @@ #include <ntg/int.hh> #include <oln/basics2d.hh> -#include <oln/lrde/ufmt/rup_maxtree.hh> +#include <oln/lrde/ufmt/rpc_maxtree.hh> #include <oln/lrde/ufmt/log.hh> @@ -11,10 +11,11 @@ void usage(char* argv[]) { std::cerr << "usage: " << argv[0] << " input.pgm c" << std::endl; - std::cerr << " raster max-tree computation with union-find" << std::endl; - std::cerr << " inspecting neighbors leads to 'insert' then 'updates'" << std::endl; - std::cerr << " p as point" << std::endl; - // FIXME: get precise description... + std::cerr << "max-tree computation with union-find" << std::endl; + std::cerr << " r. for raster video scan" << std::endl; + std::cerr << " p. image<point>" << std::endl; + std::cerr << " c. level compression" << std::endl; + std::cerr << "inspecting neighbors leads to 'insert' then 'updates'" << std::endl; exit(1); } @@ -33,7 +34,7 @@ if (not (c == 4 or c == 8)) usage(argv); - typedef lrde::ufmt::rup_maxtree<image_t> algorithm_t; + typedef lrde::ufmt::rpc_maxtree<image_t> algorithm_t; algorithm_t run(input, c == 4 ? neighb_c4() : neighb_c8()); Index: 10.246/olena/oln/lrde/ufmt/bin/hdc_maxtree.cc --- 10.246/olena/oln/lrde/ufmt/bin/si_maxtree.cc Fri, 04 Aug 2006 18:48:35 +0200 theo (oln/x/19_si_maxtree 1.1 644) +++ 10.246(w)/olena/oln/lrde/ufmt/bin/hdc_maxtree.cc Mon, 21 Aug 2006 16:15:02 +0200 theo (oln/x/19_si_maxtree 1.1 644) @@ -3,7 +3,7 @@ #include <ntg/int.hh> #include <oln/basics2d.hh> -#include <oln/lrde/ufmt/si_maxtree.hh> +#include <oln/lrde/ufmt/hdc_maxtree.hh> #include <oln/lrde/ufmt/log.hh> @@ -12,9 +12,9 @@ { std::cerr << "usage: " << argv[0] << " input.pgm c" << std::endl; std::cerr << "max-tree computation with union-find:" << std::endl; - std::cerr << " no aux data isproc" << std::endl; - std::cerr << " total level compression" << std::endl; - std::cerr << " p as index, par is replaced by dpar as image<(delta)index>" << std::endl; + std::cerr << " h. for low quant (for h, for p at h)" << std::endl; + std::cerr << " d. dpar = image<delta int>" << std::endl; + std::cerr << " c. level compression" << std::endl; // FIXME: get precise description... exit(1); } @@ -34,11 +34,11 @@ if (not (c == 4 or c == 8)) usage(argv); - typedef lrde::ufmt::si_maxtree<image_t> algorithm_t; + typedef lrde::ufmt::hdc_maxtree<image_t> algorithm_t; algorithm_t run(input, c == 4 ? neighb_c4() : neighb_c8()); - run.go(); + run.go<void>(); unsigned n = run.nnodes; assert(n == n_level_roots(run)); std::cout << "n level roots = " << n << std::endl; Index: 10.246/olena/oln/lrde/ufmt/bin/hpc_maxtree.cc --- 10.246/olena/oln/lrde/ufmt/bin/sp_maxtree.cc Fri, 04 Aug 2006 18:48:35 +0200 theo (oln/x/20_sp_maxtree 1.1 644) +++ 10.246(w)/olena/oln/lrde/ufmt/bin/hpc_maxtree.cc Mon, 21 Aug 2006 15:38:38 +0200 theo (oln/x/20_sp_maxtree 1.1 644) @@ -3,7 +3,7 @@ #include <ntg/int.hh> #include <oln/basics2d.hh> -#include <oln/lrde/ufmt/sp_maxtree.hh> +#include <oln/lrde/ufmt/hpc_maxtree.hh> #include <oln/lrde/ufmt/log.hh> @@ -12,10 +12,9 @@ { std::cerr << "usage: " << argv[0] << " input.pgm c" << std::endl; std::cerr << "max-tree computation with union-find:" << std::endl; - std::cerr << " no aux data isproc" << std::endl; - std::cerr << " total level compression" << std::endl; - std::cerr << " p as point, par as image<point>" << std::endl; - // FIXME: get precise description... + std::cerr << " h. for low quant (for h, for p at h)" << std::endl; + std::cerr << " p. image<point>" << std::endl; + std::cerr << " c. level compression" << std::endl; exit(1); } @@ -34,11 +33,13 @@ if (not (c == 4 or c == 8)) usage(argv); - typedef lrde::ufmt::sp_maxtree<image_t> algorithm_t; + typedef lrde::ufmt::hpc_maxtree<image_t> algorithm_t; algorithm_t run(input, c == 4 ? neighb_c4() : neighb_c8()); - run.go(); + run.go<void>(); + // save(tree_image(run, true), "tree.pgm"); + unsigned n = run.nnodes; assert(n == n_level_roots(run)); std::cout << "n level roots = " << n << std::endl; Index: 10.246/olena/oln/lrde/ufmt/bin/r1ic_maxtree.cc --- 10.246/olena/oln/lrde/ufmt/bin/r1_maxtree.cc Fri, 04 Aug 2006 18:48:35 +0200 theo (oln/x/21_r1_maxtree 1.1 644) +++ 10.246(w)/olena/oln/lrde/ufmt/bin/r1ic_maxtree.cc Mon, 21 Aug 2006 16:45:45 +0200 theo (oln/x/21_r1_maxtree 1.1 644) @@ -3,7 +3,7 @@ #include <ntg/int.hh> #include <oln/basics1d.hh> -#include <oln/lrde/ufmt/r1_maxtree.hh> +#include <oln/lrde/ufmt/r1ic_maxtree.hh> #include <oln/lrde/ufmt/log.hh> @@ -12,8 +12,10 @@ { std::cerr << "usage: " << argv[0] << " input1D.pgm" << std::endl; std::cerr << "1D raster max-tree computation with union-find" << std::endl; + std::cerr << " r. for raster video scan" << std::endl; + std::cerr << " i. par = image<int>" << std::endl; + std::cerr << " c. level compression" << std::endl; std::cerr << "inspecting the only neighbor calls 'insert'" << std::endl; - // FIXME: get precise description... exit(1); } @@ -27,7 +29,7 @@ typedef image1d<ntg::int_u8> image_t; image_t input = load(argv[1]); - typedef lrde::ufmt::r1_maxtree<image_t> algorithm_t; + typedef lrde::ufmt::r1ic_maxtree<image_t> algorithm_t; algorithm_t run(input); run.go(); Index: 10.246/olena/oln/lrde/ufmt/README --- 10.246/olena/oln/lrde/ufmt/README Fri, 04 Aug 2006 18:48:35 +0200 theo (oln/x/22_README 1.1 644) +++ 10.246(w)/olena/oln/lrde/ufmt/README Mon, 21 Aug 2006 16:38:18 +0200 theo (oln/x/22_README 1.1 644) @@ -2,74 +2,6 @@ - -* to-do - -** raster - -*** settings -p as index -naming: "r_" prefix - -*** our versions -1D ("r1_" prefix) -nD insert + update ("ru_" prefix) -nD merge ("rm_" prefix) - -*** others -salembier -meijster - -** FIXME - -to be continued - - -* naming - -** p encoding - -*** p -p = point2d -par = image<point> - -*** d -for debug purpose -p_ref = point2d -par_ref = image<point> -dpar_ref = image<dpoint> -invariant: par_ref[p_ref] = p_ref + dpar_ref[p_ref] -p = index -dpar = image<index> -invariants: p = p_ref and dpar = dpar_ref - -*** i -p = index -dpar = image<(delta) index> -par is now a function -FIXME: we should avoid calling it (instead use dpar) - - -** 1st pass browsing - -*** basic -sorted, simple loop: -| for all p -| union-find - -*** s -sorted, _total_ level compression -| for all h -| for all p fwd -| union-find -| for all p bkd -| compression - -*** r -raster - - - * basic_maxtree ** features @@ -97,42 +29,91 @@ nbh is splitted into pre and post so isproc is no more aux data 2 functions: isproc_pre and isproc_post -benefit: memory gain - -*** level compression -''natural'' algorithm enhancement -browsing is "for h, for p fwd, for p bkd" -benefit: usually faster thanx to compression +benefit: memory saving *** node/levroot counting during the compression -benefit: we need to know nnodes +benefit: we need to know nnodes before the 2nd pass +without introducing an intermediate pass -** further (later) optims -*** point as index -*** virtual border +* algorithms deriving from basic_maxtree -*** fully compressed 2nd parent -so remove the inner compression pass! +** browsing -* specializations +*** s +when quantization is high +std::sort +browsing is: +| for all p taken with f(p) decreasing +| union-find -** 1D sorted union-find -level compression -point as index -? virtual border -? 2nd parent - -** 2D raster -FIXME: rup2_maxtree -FIXME: rui2_maxtree +*** h +when quantization is low +counting sort +browsing is: +| for all h +| for all p fwd s.a. f(p) = h +| union-find +| for all p bkd s.a. f(p) = h +| compression +benefit: usually faster thanx to compression + +*** r +raster (classic video scan) +no sorting +browsing is: +| for all p fwd +| union-find +benefit: incremental, card(nbh)/2 +use: insert (p->tree) and update (tree is in/out) + + +** point encoding + +*** p +point = point2d = (int, int) +par[p] = point2d + +*** i +point = int +par[p] = point + +*** d +point = index = int +dpar[p] = delta point = delta index = int +benefit: make_sets() = memset(dpar, 0) + + +** compression + +*** c +level-compression of par (resp. dpar) +find_root = loop over find_level_root + +*** x +use of aux data: c_par (resp. c_dpar) +for full compressed access to root +find_root = quicker + + +** further (later) optims + +virtual border... + + +** status + +hpc impled +hpx impled +rpc impled -** 1D raster -r1_maxtree // is r1i +hdc impled +hdx impled +r1ic do not compile (ric specialized for 1D images) * basic_salembier Only in 10.246: libtool Only in 10.246: config/ltmain.sh Only in 10.246: config/config.sub Only in 10.246: config/config.guess Only in 10.246: doc/ref/exdoc.mk Only in 10.246: doc/ref/doxygen.config Only in 10.246: doc/ref/out/exdoc.config