June 2009 - Olena-patches

[PATCH 4/6] Distribute tests/ properly.
by Roland Levillain 10 Jun '09

10 Jun '09

* tests/Makefile.am (SUBDIRS): Add extract. (EXTRA_DIST): Add tools/pretty_check.sh. * tests/unit_test/Makefile.am (EXTRA_DIST): Add build_unit_test.sh. --- milena/ChangeLog | 8 ++++++++ milena/tests/Makefile.am | 7 ++++--- milena/tests/unit_test/Makefile.am | 1 + 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index a95a6f0..b69ce9c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2009-06-10 Roland Levillain <roland(a)lrde.epita.fr> + Distribute tests/ properly. + + * tests/Makefile.am (SUBDIRS): Add extract. + (EXTRA_DIST): Add tools/pretty_check.sh. + * tests/unit_test/Makefile.am (EXTRA_DIST): Add build_unit_test.sh. + +2009-06-10 Roland Levillain <roland(a)lrde.epita.fr> + Distribute doc/ properly. * doc/Makefile.am (SUBDIRS): Add ref_guide and tutorial. diff --git a/milena/tests/Makefile.am b/milena/tests/Makefile.am index 18a5a76..09d1302 100644 --- a/milena/tests/Makefile.am +++ b/milena/tests/Makefile.am @@ -19,8 +19,6 @@ include $(top_srcdir)/milena/tests/tests.mk -.PHONY: pretty-check - SUBDIRS = \ accu \ algebra \ @@ -36,6 +34,7 @@ SUBDIRS = \ draw \ estim \ extension \ + extract \ fun \ geom \ graph \ @@ -85,6 +84,8 @@ global_vars_SOURCES = global_vars1.cc global_vars2.cc TESTS = $(check_PROGRAMS) +EXTRA_DIST = tools/pretty_check.sh +.PHONY: pretty-check pretty-check: $(top_srcdir)/milena/tests/tools/pretty_check.sh @@ -92,7 +93,7 @@ pretty-check: include $(top_srcdir)/build-aux/regen-recursive.mk REGEN_SUBDIRS += unit_test -EXTRA_DIST = \ +EXTRA_DIST += \ img/lena_ascii.pbm \ img/lena_ascii.pgm \ img/lena_raw.pbm \ diff --git a/milena/tests/unit_test/Makefile.am b/milena/tests/unit_test/Makefile.am index 985fdee..3ea19b7 100644 --- a/milena/tests/unit_test/Makefile.am +++ b/milena/tests/unit_test/Makefile.am @@ -25,6 +25,7 @@ regen-am: cd $(srcdir) \ && ./build_unit_test.sh $(abs_top_srcdir)/milena/mln +EXTRA_DIST = build_unit_test.sh # FIXME: Change build_unit_test.sh so that the action looks like this: # # $< $@.tmp && mv -f $@.tmp $@ && chmod -w $@ -- 1.6.2.4

1 0

[PATCH 3/6] Distribute doc/ properly.
by Roland Levillain 10 Jun '09

10 Jun '09

* doc/Makefile.am (SUBDIRS): Add ref_guide and tutorial. (EXTRA_DIST): Add generate_dist_files.sh. --- milena/ChangeLog | 7 +++++++ milena/doc/Makefile.am | 4 +++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 40c618f..a95a6f0 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2009-06-10 Roland Levillain <roland(a)lrde.epita.fr> + Distribute doc/ properly. + + * doc/Makefile.am (SUBDIRS): Add ref_guide and tutorial. + (EXTRA_DIST): Add generate_dist_files.sh. + +2009-06-10 Roland Levillain <roland(a)lrde.epita.fr> + Distribute apps/statues properly. * apps/statues/Makefile.am (mesh_complex_skel_SOURCES): diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index c6959b6..bf1d0b1 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -20,6 +20,8 @@ include $(top_srcdir)/milena/doc/doc.mk SUBDIRS = \ + examples \ + ref_guide \ tutorial \ white_paper @@ -138,6 +140,7 @@ edit_user = sed -e 's,OUTPUT_DIRECTORY = ./complete/,OUTPUT_DIRECTORY # Regen files. +EXTRA_DIST = generate_dist_files.sh headers.stamp include $(top_srcdir)/build-aux/regen-recursive.mk regen-am: @rm -f $(srcdir)/headers.stamp.tmp @@ -150,7 +153,6 @@ $(srcdir)/figures/figures.mk: $(srcdir)/headers.stamp $(srcdir)/outputs/outputs.mk: $(srcdir)/headers.stamp -EXTRA_DIST = $(srcdir)/headers.stamp $(srcdir)/headers.stamp: $(srcdir)/generate_dist_files.sh @rm -f $@.tmp @touch $@.tmp -- 1.6.2.4

1 0

[PATCH 2/6] Makefile.am (wrappers): Add config.i.
by Roland Levillain 10 Jun '09

10 Jun '09

--- swilena/ChangeLog | 4 ++++ swilena/Makefile.am | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 4359233..945c8b9 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,5 +1,9 @@ 2009-06-10 Roland Levillain <roland(a)lrde.epita.fr> + * Makefile.am (wrappers): Add config.i. + +2009-06-10 Roland Levillain <roland(a)lrde.epita.fr> + Update copyright headers in Swilena/Python. * python/box2d-misc.py, diff --git a/swilena/Makefile.am b/swilena/Makefile.am index 0db5787..c6fd023 100644 --- a/swilena/Makefile.am +++ b/swilena/Makefile.am @@ -41,6 +41,7 @@ meta_wrappers = \ wrappers = \ box2d.i \ box2d_piter.i \ + config.i \ dpoint2d.i \ image2d_int.i \ image2d_int_u8.i \ -- 1.6.2.4

1 0

[PATCH 1/6] Distribute apps/statues properly.
by Roland Levillain 10 Jun '09

10 Jun '09

* apps/statues/Makefile.am (mesh_complex_skel_SOURCES): Add save_bin_alt.hh. --- milena/ChangeLog | 7 +++++++ milena/apps/statues/Makefile.am | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e5aa3c9..40c618f 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2009-06-10 Roland Levillain <roland(a)lrde.epita.fr> + Distribute apps/statues properly. + + * apps/statues/Makefile.am (mesh_complex_skel_SOURCES): + Add save_bin_alt.hh. + +2009-06-10 Roland Levillain <roland(a)lrde.epita.fr> + Regen some reference images of the documentation. * doc/figures/fill-subdomain-2.ppm, diff --git a/milena/apps/statues/Makefile.am b/milena/apps/statues/Makefile.am index 6ad3c22..0baf887 100644 --- a/milena/apps/statues/Makefile.am +++ b/milena/apps/statues/Makefile.am @@ -135,5 +135,5 @@ TESTS += test-mesh-complex-max-curv-segm # Skeletonization program working on precomputed meshes with curvatures data. bin_PROGRAMS += mesh-complex-skel -mesh_complex_skel_SOURCES = mesh-complex-skel.cc +mesh_complex_skel_SOURCES = mesh-complex-skel.cc save_bin_alt.hh TESTS += test-mesh-complex-skel -- 1.6.2.4

1 0

4090: Regen some reference images of the documentation.
by Roland Levillain 10 Jun '09

10 Jun '09

* doc/figures/fill-subdomain-2.ppm, * doc/figures/fill-subdomain-3.ppm, * doc/figures/labeling-compute-2.ppm, * doc/figures/tuto3_colorize-2.ppm, * doc/figures/tuto4_genericity_and_algorithms-5.ppm: Regen. --- milena/ChangeLog | 11 +++++++++++ milena/doc/figures/fill-subdomain-2.ppm | Bin 206 -> 206 bytes milena/doc/figures/fill-subdomain-3.ppm | Bin 206 -> 206 bytes milena/doc/figures/labeling-compute-2.ppm | Bin 206 -> 206 bytes milena/doc/figures/tuto3_colorize-2.ppm | Bin 191 -> 191 bytes .../figures/tuto4_genericity_and_algorithms-5.ppm | Bin 12406 -> 12406 bytes 6 files changed, 11 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index ee7c323..e5aa3c9 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,16 @@ 2009-06-10 Roland Levillain <roland(a)lrde.epita.fr> + Regen some reference images of the documentation. + + * doc/figures/fill-subdomain-2.ppm, + * doc/figures/fill-subdomain-3.ppm, + * doc/figures/labeling-compute-2.ppm, + * doc/figures/tuto3_colorize-2.ppm, + * doc/figures/tuto4_genericity_and_algorithms-5.ppm: + Regen. + +2009-06-10 Roland Levillain <roland(a)lrde.epita.fr> + * doc/tutorial/tutorial.tex: Disable FIXMEs (\tofix commands). 2009-06-10 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/milena/doc/figures/fill-subdomain-2.ppm b/milena/doc/figures/fill-subdomain-2.ppm index 7bfa0e4c45344b8acdbefee7347dd890f15031a2..e3a7982f41f6a1484c3254833a89f3673b992c9e 100644 GIT binary patch delta 94 wcmX@dc#d&GdAMnAHV`qu02&u245D8c%>yDJWBV-~2p7Tza)AgU1r&h*0N5E71poj5 delta 94 wcmX@dc#d&GdARDibRc4Y0W>a57(^@2GzTIeBQhoo!iBJbTp)r-0YxAH0E}l4T>t<8 diff --git a/milena/doc/figures/fill-subdomain-3.ppm b/milena/doc/figures/fill-subdomain-3.ppm index 037dec623f7a3629cc0b4cc0523eb091071ccfc4..7e344cee6274a7d10e4008ee6ca865c6ece134a7 100644 GIT binary patch delta 52 bcmX@dc#d(xLS56`Y#?HQ0c18%42=r_83+e4 delta 52 bcmX@dc#d(xLS5B!=|IE)1ITQk7#bG<KUfH5 diff --git a/milena/doc/figures/labeling-compute-2.ppm b/milena/doc/figures/labeling-compute-2.ppm index 7bfa0e4c45344b8acdbefee7347dd890f15031a2..e3a7982f41f6a1484c3254833a89f3673b992c9e 100644 GIT binary patch delta 94 wcmX@dc#d&GdAMnAHV`qu02&u245D8c%>yDJWBV-~2p7Tza)AgU1r&h*0N5E71poj5 delta 94 wcmX@dc#d&GdARDibRc4Y0W>a57(^@2GzTIeBQhoo!iBJbTp)r-0YxAH0E}l4T>t<8 diff --git a/milena/doc/figures/tuto3_colorize-2.ppm b/milena/doc/figures/tuto3_colorize-2.ppm index c7b0c0151897e22f7a089ef8d7f16af669a11061..ebcf745d4c9b8ee6b805d82a5def21568cb22dcf 100644 GIT binary patch delta 82 zcmdnbxSw%CiMPtqJ|I#r%?2VPWfeFV$OfVv7Mc*m00x=nuLGQ=faJk75<moGKoEor E0HgRGZvX%Q delta 82 zcmdnbxSw%CiMNP^6cG6-ZUrL6NoH^^kPSo^bCy960~l;Nc)c({6iB|;+5$vC1_VL4 E0GcWzGynhq diff --git a/milena/doc/figures/tuto4_genericity_and_algorithms-5.ppm b/milena/doc/figures/tuto4_genericity_and_algorithms-5.ppm index caa01857a968090f4ef06142068aa3c47e3c090d..4efa88ca45f9ce3bd0b22f16fdf93cd150d56967 100644 GIT binary patch literal 12406 zcmdUt&59jW6ono4D>x}oFoJYU=<Y#gLbsu@g%A|SH+IDY`;Y5I=z;hSf{>BEgy6_w zKyct(N6wu14sKcSvDoL-sj6#Te?oIuXYaMw{_5mDI@)`!d)Qy~>(!<|@1ERt??1oj zuU6f?{kOaB*=BR|;O^b)zbg9|>+^oUzj?k{?LS?|)XAgM58mk>_n-Bv^~cY;)zx`- z+<)F*T;E*wSDWr^_2fE2uh+NTowLWsCvWZ@9dt(rd-o3y_YN;Vt^U0-|KIQTzlp!; zbJe{RBPVn_?fYNe!tbIzwN%$PR`rxm7#ds(vYk`iPVqm^4`)M+enNG&{b;kgUwrpN z!(ZL*#m1~!ZbpwzH4L*tFjqxvi8^O>DTA`<T6H#xgjB_LgPMxKBvP6Kvpso+uK1^j zYDhU)+QJh>okLyKNh@uQ3R9z^3@Jz4<6W=24i8uSR3-`rM@0(6uX<cVaHejWEw6L^ zp1^EX;EXOh1ZEYvx^REeUp_tX3R7O3q8ThjjH^gaTwRx455bv4kn7Lu40>@?Gc_uR z3a2z9v_hz>me*bXEBs(5NUsZWBK#J=pR`Mhrk}i_av1bFEs8F9`7M4wO7=9@z_bM; zZc|YeH=q%V^T*N%cbK`_$I%jT`o9DpSMRddi>`(06=?>S66K1hl<<r2FU9ORyW@{7 z9_~vQ*S@Iw_*=Zc^X~$fOotEszu*VnU#S8AH{U;!ePcuGF&hT8ut{(ZJ^t4Gu`a@g zc)&<hLw=<Z2)0B6emj1xtHQ7v4^&luStJ3mAU`k&090Wq0z*}#9HtO$__^=TI^{c( zTAZc9&1kntr}H1+PaESJcq+o#5ID=6sO*%#x>2anYA}0CAyFyQM&Y;k{jjdO5e6r0 zYXX@??37<yPCojHbuQY>-qlo8d_43N__^<2ZmIG+o-~lDm6-jyEWhv7mLMO6cOL07 z2Tyv;UGTF@qRsE-z}6N1xJqN&9e-LH8};}le{ymKwX9V6Cq91qWWvb|k&1CuSD)Zc z%m`+OgpWJSQvALbDlIMfWmeY*T@&JFjqHLyt&64F#pyqxgyh)h6i7~p#rav9gfE3( z9&e?oxT-5r`r)7W<4K<!S2nVUiVJo9EMYv2*)rBcX7T$VnnfYXU3Bpy)Z#ici=i5| zBmP**x{{L?YzSII0w+SB(Ej~kE`={rmrCPW=1^h0DzG7T!B6-^2K*s3;uVU~O7*z5 zUtV8VPEkpOQD;kP`IYgiAVFyiR?Thx>WCK!*V1%)7wzL!EhnvXr7p1xepbMYpw$qV zT@3k`<xg82Aav?Bu4%9_JDne=?`<z?cReTR>4QNPv#=#Wtm<45zK9~iyJ)%%fjNnC zqy#HJA$dNzxf6eis^-7EycgYQ=}aEgOA@b?BVKW5NlQ0cp%Z*m#IH~A*eaNcqc)a? zNal2v0e|8zY4sKOCHOBW!*Tw4`lEF6=!&frRlgTwB(549;s+byi>mx?NP1{{via3V zk`7y&Umq2=Dty#O`QLl}fx~E{W2A2N>VDU57HT>%%;M)w7<VxQ;2vpme8jbEFTVOC zL?YK!h9UUq^8TSo*3{66EyR$AGz>oFIt)Yn(GvMw{x%qFZJQvc@Z%A%UVfBZQ*+-x zJ)N&k8YgusF4R4J_h)Ppd`08&!zunaLlc{#(siPZKp$t;MHou{DC!e@ywqFpM~JqU zX{iDvbt*2RJH*eRi*LVvgX?tu7q8xGY9f4?9Wu0!dkdH;!r|rDCxj-mngc)1sx1}C oYzt*-_QSK&6ynz{_#Yns774+xKcxka#}4T>cIpm=P*3oG0>?sDCjbBd literal 12406 zcmdUtzl&W}6osv)x6<N55TeB!CnO`-sF)~1lrRKA(Bj3pn!q?SJRd?z!T&*Q)2Fep zOru~Sq!+<P#DBvr3qBV6oO|xQ&-?rlhQm60uf6tnPu`v5gDc(J{dvDxZ~N2k-ox(Q z2WS2Hx;t9E+;#W2+sjuE4=?_ztj;#4{i?rwuwAb{*~HYXJMY|mqdVz8@7J4;?|19- z)9z;fMSpg2`B{Iy?QXB{T}0@`=3#gB_Q}m#FCH9U?~bn@T)T1O;Dx83R{x%v|L@8- zuf*T<x$0hukrTR|_Q8km<9E@XTB_?Ct9r^O3=J*?+0LnMr}!V|hqEC@KcPC?ezaNL z=e~Qk;jeD@Vq;b<H={?V8irXRn5!bTM4hv`ltI~atvVY;LaJi7K}|(q5-H7r*`7Q@ zSNu~%HKZIYZQ+Tc&Y`aAq?NWtg{e_dhLj`j@vhfhhleYEDiZ~Rqap?3S3RyFI8!&x zme;v{Phhqxa7Gs$0<(%-UARB#pMHGe6{fs6MKf567*~;;xVkR89)dH8AlIMQ8T8_) zW@=Or6;5eJXoXN$Ew8)&SNOqBkX{$$MED(kKWUd1O+R@<<uK@VS`=OI@;m%~l<aA) zfoTgy+@_)`Za^az=Z~ck?l5z;kE12x^nVFHuHI#@7hMb0E7A-uCCU|1Dd894Uy9jt z_QxMvJlvNqu6<GU@ppKC=idh~nGPTNf58vDzfuGKZ@zyd`^JXWV>S$GVUyq-di<UF zV_k#~@qm%2hWtt+5NwGC{BHbOSA}6U9;mARvPc4AL4IHm0I0%J1cs_eIZPqi@N?gv zb;@@nwKz+Io6&BQPUk<spEkxd@Kl7eA#j#CQQ0ehb)!(D)nN9PLZVWpjl%En`(a&m zBMeU1)&w$(*ek!bJiWSNor^ZJcQq9i9}hhRe(w91TdMqyCk<q3C1$@a%kO)&CCEqN zokzON!IK_yAN=f+X!E-{uyut$uF}}{$DfwQMm>JXpPXDlEh|<2iI1N?nQ$^gq+(pv z)hD<UGlJP6;o}ao6u<9<N=r+Anbq|{*MzuPBm3Y_>td;Par#dvAvrcW1(FkDaekI2 z;Y;C{$6IMCuIfsZe)uQ;c+w}wm5nT-;zC_NOBhdMwv6?VS^PeTW>JW87hU`awYUz= zVyH&#i9eRIuH>Wz8-mu5z=_Z&w0}RCOW}*urP8>TIaC<03T%jd@Do0f0e=XMc!grL zQa!Him)F;oQ&bXR)Y+0+er3EWNKhJsRdbuaI^spbwKSdHMf-SF%SkI;sY~pGpA|48 zXf*_87eoGK`O_8$2%Wl(YZ`3KPUpwzd)tfJUC&8+`e0DSENn>-t2$SNFQSO>E}Cvb zU{0bODZ$E5NS?2M_$vMsRn7nX@cHOQOK0+^UXpmF9Px@fOIo_o3Z3AiB7S{>$5z2q z9JR4DL^7wV4EPg&Nvp5GFTsC78IJR%w|<pQ9$m4OqU!fzjKo!gL;PSPd{LF(4M`7e zPd2~$NYY_z^XsF+R)vrHDF63wzUDC6=oqP6y}IAEn}wQA472!o6UJQ(0k}t+93OEl z+oO{&LnLxtWf+2wF7F?jWK9j7*g_0>NW<V$uEQ|IA1#s3<!^(**0u?93O^nJ>*Ytu zH8uDB)6@Ctq;XQG;zHfuj^4v2!B;dMKb+!^Gc>U&DqSbq2=sAgU4)_JkD@-o$4k8f ze}rgznU*R*Qm5h~x<mX7y7*)J5!dPbkB=T{Y9f4?9Wu0!dkdH;!r|rDCxj-mngc)1 ssx1}CYzt*-_Vr)-6ynz%`0sxEb0h@6{*)Fx9y_Gl*r_`dLOsF%2~_1-8vp<R -- 1.6.1.2

1 0

[PATCH 2/2] doc/tutorial/tutorial.tex: Disable FIXMEs (\tofix commands).
by Roland Levillain 10 Jun '09

10 Jun '09

--- milena/ChangeLog | 4 ++++ milena/doc/tutorial/tutorial.tex | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index fb8a1f8..ee7c323 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2009-06-10 Roland Levillain <roland(a)lrde.epita.fr> + * doc/tutorial/tutorial.tex: Disable FIXMEs (\tofix commands). + +2009-06-10 Roland Levillain <roland(a)lrde.epita.fr> + Fix the generation of the tutorial. * doc/tutorial/tutorial.tex: Use \color instead of \colortext. diff --git a/milena/doc/tutorial/tutorial.tex b/milena/doc/tutorial/tutorial.tex index a9dfddb..91a7eb6 100644 --- a/milena/doc/tutorial/tutorial.tex +++ b/milena/doc/tutorial/tutorial.tex @@ -46,8 +46,8 @@ \usepackage{milena} % FIXME: Consider using the package FiXme from Didier Verna instead. -\newcommand{\tofix}[1]{{\color{red}(FIXME: #1)}} -%\newcommand{\tofix}[1]{} +%\newcommand{\tofix}[1]{{\color{red}(FIXME: #1)}} +\newcommand{\tofix}[1]{} \title{Olena -- Tutorial} -- 1.6.2.4

1 0

[PATCH 1/2] Fix the generation of the tutorial.
by Roland Levillain 10 Jun '09

10 Jun '09

* doc/tutorial/tutorial.tex: Use \color instead of \colortext. --- milena/ChangeLog | 6 ++++++ milena/doc/tutorial/tutorial.tex | 3 ++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 13cce75..fb8a1f8 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2009-06-10 Roland Levillain <roland(a)lrde.epita.fr> + Fix the generation of the tutorial. + + * doc/tutorial/tutorial.tex: Use \color instead of \colortext. + +2009-06-10 Roland Levillain <roland(a)lrde.epita.fr> + Disable very long tests in apps/statues. * apps/statues/test-mesh-complex-max-curv-segm.in, diff --git a/milena/doc/tutorial/tutorial.tex b/milena/doc/tutorial/tutorial.tex index 55948e0..a9dfddb 100644 --- a/milena/doc/tutorial/tutorial.tex +++ b/milena/doc/tutorial/tutorial.tex @@ -45,7 +45,8 @@ \usepackage{doxyfuns} \usepackage{milena} -\newcommand{\tofix}[1]{\colortext{red}{(FIXME: #1)}} +% FIXME: Consider using the package FiXme from Didier Verna instead. +\newcommand{\tofix}[1]{{\color{red}(FIXME: #1)}} %\newcommand{\tofix}[1]{} -- 1.6.2.4

1 0

4087: Disable very long tests in apps/statues.
by Roland Levillain 10 Jun '09

10 Jun '09

* apps/statues/test-mesh-complex-max-curv-segm.in, * apps/statues/test-mesh-complex-segm.in, * apps/statues/test-mesh-complex-skel.in, * apps/statues/test-mesh-segm.in: Here. --- milena/ChangeLog | 10 ++++++++++ .../statues/test-mesh-complex-max-curv-segm.in | 3 ++- milena/apps/statues/test-mesh-complex-segm.in | 3 ++- milena/apps/statues/test-mesh-complex-skel.in | 3 ++- milena/apps/statues/test-mesh-segm.in | 3 ++- 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 2cd2c97..13cce75 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2009-06-10 Roland Levillain <roland(a)lrde.epita.fr> + Disable very long tests in apps/statues. + + * apps/statues/test-mesh-complex-max-curv-segm.in, + * apps/statues/test-mesh-complex-segm.in, + * apps/statues/test-mesh-complex-skel.in, + * apps/statues/test-mesh-segm.in: + Here. + +2009-06-10 Roland Levillain <roland(a)lrde.epita.fr> + * tests/labeling/colorize.cc: Remove non-deterministic assertion. 2009-06-10 Fabien Freling <fabien.freling(a)lrde.epita.fr> diff --git a/milena/apps/statues/test-mesh-complex-max-curv-segm.in b/milena/apps/statues/test-mesh-complex-max-curv-segm.in index 1ec6197..7200ba7 100644 --- a/milena/apps/statues/test-mesh-complex-max-curv-segm.in +++ b/milena/apps/statues/test-mesh-complex-max-curv-segm.in @@ -6,4 +6,5 @@ mesh_dir=@top_srcdir@/milena/mesh time ./mesh-complex-max-curv-segm $mesh_dir/socket.off 25 socket-complex-max-curv-segm.off time ./mesh-complex-max-curv-segm $mesh_dir/teapot.off 50 teapot-complex-max-curv-segm.off -time ./mesh-complex-max-curv-segm $mesh_dir/bunny-holefilled.off 500 bunny-holefilled-complex-max-curv-segm.off +# FIXME: Too long. Should be run with (future) target `check-full'. +#time ./mesh-complex-max-curv-segm $mesh_dir/bunny-holefilled.off 500 bunny-holefilled-complex-max-curv-segm.off diff --git a/milena/apps/statues/test-mesh-complex-segm.in b/milena/apps/statues/test-mesh-complex-segm.in index 05a28ca..dd0ccc4 100644 --- a/milena/apps/statues/test-mesh-complex-segm.in +++ b/milena/apps/statues/test-mesh-complex-segm.in @@ -6,4 +6,5 @@ mesh_dir=@top_srcdir@/milena/mesh time ./mesh-complex-segm $mesh_dir/socket-max-curv.off 25 socket-max-curv-segm.off time ./mesh-complex-segm $mesh_dir/teapot-max-curv.off 50 teapot-max-curv-segm.off -time ./mesh-complex-segm $mesh_dir/bunny-holefilled-pinv-curv.off 500 bunny-holefilled-pinv-curv-segm.off +# FIXME: Too long. Should be run with (future) target `check-full'. +#time ./mesh-complex-segm $mesh_dir/bunny-holefilled-pinv-curv.off 500 bunny-holefilled-pinv-curv-segm.off diff --git a/milena/apps/statues/test-mesh-complex-skel.in b/milena/apps/statues/test-mesh-complex-skel.in index 9b34767..7f0714d 100644 --- a/milena/apps/statues/test-mesh-complex-skel.in +++ b/milena/apps/statues/test-mesh-complex-skel.in @@ -7,4 +7,5 @@ mesh_dir=@top_srcdir@/milena/mesh time ./mesh-complex-skel $mesh_dir/three-triangles.off 1 three-triangles-skel.off time ./mesh-complex-skel $mesh_dir/socket-max-curv.off 10 socket-max-curv-skel.off time ./mesh-complex-skel $mesh_dir/teapot-max-curv.off 20 teapot-max-curv-skel.off -time ./mesh-complex-skel $mesh_dir/bunny-holefilled-pinv-curv.off 50 bunny-holefilled-pinv-curv-skel.off +# FIXME: Too long. Should be run with (future) target `check-full'. +#time ./mesh-complex-skel $mesh_dir/bunny-holefilled-pinv-curv.off 50 bunny-holefilled-pinv-curv-skel.off diff --git a/milena/apps/statues/test-mesh-segm.in b/milena/apps/statues/test-mesh-segm.in index 181a1fd..e50d270 100755 --- a/milena/apps/statues/test-mesh-segm.in +++ b/milena/apps/statues/test-mesh-segm.in @@ -6,4 +6,5 @@ mesh_dir=@top_srcdir@/milena/mesh time ./mesh-segm $mesh_dir/socket.off 25 socket-segm.off time ./mesh-segm $mesh_dir/teapot.off 50 teapot-segm.off -time ./mesh-segm $mesh_dir/bunny-holefilled.off 500 bunny-holefilled-segm.off +# FIXME: Too long. Should be run with (future) target `check-full'. +#time ./mesh-segm $mesh_dir/bunny-holefilled.off 500 bunny-holefilled-segm.off -- 1.6.2.4

1 0

4086: tests/labeling/colorize.cc: Remove non-deterministic assertion.
by Roland Levillain 10 Jun '09

10 Jun '09

--- milena/ChangeLog | 4 ++++ milena/tests/labeling/colorize.cc | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 718c736..2cd2c97 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2009-06-10 Roland Levillain <roland(a)lrde.epita.fr> + + * tests/labeling/colorize.cc: Remove non-deterministic assertion. + 2009-06-10 Fabien Freling <fabien.freling(a)lrde.epita.fr> Fix reference guide. diff --git a/milena/tests/labeling/colorize.cc b/milena/tests/labeling/colorize.cc index ffdc658..18ae5ae 100644 --- a/milena/tests/labeling/colorize.cc +++ b/milena/tests/labeling/colorize.cc @@ -45,6 +45,4 @@ int main() image2d<rgb_t> ref = make::image(ref_data); image2d<value::rgb8> ima_color = labeling::colorize(value::rgb8(), ima); - - mln_assertion(ref == ima_color); } -- 1.6.1.2

1 0

milena r4085: Fix reference guide
by Fabien Freling 10 Jun '09

10 Jun '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2009-06-10 Fabien Freling <fabien.freling(a)lrde.epita.fr> Fix reference guide. * doc/ref_guide/ref_guide.tex: Fix some errors and remove missing parts. --- ref_guide.tex | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) Index: trunk/milena/doc/ref_guide/ref_guide.tex =================================================================== --- trunk/milena/doc/ref_guide/ref_guide.tex (revision 4084) +++ trunk/milena/doc/ref_guide/ref_guide.tex (revision 4085) @@ -71,10 +71,10 @@ - \backslash subpage basicops - \backslash subpage inputoutput - \backslash subpage graphandima -- \backslash subpage funs -- \backslash subpage arithmops -- \backslash subpage mathtools -- \backslash subpage debugtools +%- \backslash subpage funs +%- \backslash subpage arithmops +%- \backslash subpage mathtools +%- \backslash subpage debugtools - \backslash subpage globalvars - \backslash subpage macros \backslash htmlonly @@ -196,10 +196,10 @@ \end{figure} Olena is organized in a namespace hierarchy. Everything is declared by Olena -within the 'oln::' namespace, and possibly a sub-namespace such as -'\namespace{oln::arith::}' (arithmetic operations on images), '\namespace{oln::morpho::}' (morphological +within the 'mln::' namespace, and possibly a sub-namespace such as +'\namespace{mln::arith::}' (arithmetic operations on images), '\namespace{mln::morpho::}' (morphological operations), etc. Usually, the namespace hierarchy is mapped to the mln -directory tree. For the sake of simplicity, we will neglect the '\namespace{oln::}' +directory tree. For the sake of simplicity, we will neglect the '\namespace{mln::}' prefix in all the code examples. Methods provided by objects in the library are in constant time. If you need @@ -233,12 +233,12 @@ \doxysection{compilehint}{Writing and compiling a program with Olena} -Before writing your first program, please be ware of these hints: +Before writing your first program, please be aware of these hints: \begin{itemize} \item By default, Olena enables a lot of internal pre and post conditions. - Usually, this is a useful feature and it \should be enabled. It can heavily - slow down a program though and these tests can be disabled by compiling + Usually, this is a useful feature and it \should be enabled. However, it can heavily + slow down a program though so these tests can be disabled by compiling using \code{-DNDEBUG}. \begin{verbatim} $ g++ -DNDEBUG -Ipath/to/mln my_program.cc @@ -258,7 +258,7 @@ Usually, when talking about images, we think about common images composed of a set of pixels. Since Olena is generic, we want to support many kind of images, even images -which are not composed of a set of pixels, such as images having images as sites. +which are not composed of a set of points, such as images having images as sites. In order to express this genericity, we have the ``site'' concept. This concept allows us to divide a pixel into two information: @@ -269,10 +269,6 @@ Let's say we have a 2D grid like this: -//FIXME -[dessin de grille 2d, colonnes/lignes numerotees + repere x/y] -Intersection == point 2d == milieu d'un pixel \\ - %FIXME: Find a way to get that figure in HTML output. \begin{latexonly} \begin{tikzpicture}[scale=1] @@ -297,7 +293,7 @@ Intersection $\equiv$ point2d (2D site) $\equiv$ center of a pixel \end{center} -The site does not store any value but refer to an area where we will be able +The site does not store any value but refers to an area where we will be able to read its value. Sites may have a different types, depending on the image type: @@ -306,14 +302,14 @@ Name & Description \\ \hline \type{point2d} & 2D point on a regular grid \\ -\type{point} & Generic point ($n-D$) on a regular grid \\ +\type{point} & Generic point ($n$D) on a regular grid \\ \type{util::vec} & Algebraic vector \\ \type{util::vertex} & Graph vertex \\ \type{util::edge} & Graph edge \\ \end{tabular} -[Illustration : grille + intersection + pmin() + pmax() + distance entre 2 -points en x et en y = 1]\\ +%FIXME: [Illustration : grille + intersection + pmin() + pmax() + distance entre +% 2 points en x et en y = 1]\\ %==================================== @@ -448,7 +444,7 @@ \type{image3d} & 3D image \\ \type{flat\_image} & Constant value image \\ \type{image\_if} & Image defined by a function \\ -FIXME & FIXME \\ +%FIXME & FIXME \\ \end{tabular} %************************** @@ -538,6 +534,10 @@ These concepts are useful in many algorithms and can avoid costly tests while working with sites located on image edges. +%FIXME: We should be more precise about what is a border, what is an extension. +% For example, we could say that an extension contains sites that are not included +% in the domain. + \doxysubsection{imabordersection}{Image border} A border is a finite extension provided to a basic image type, such as @@ -699,9 +699,6 @@ \bigskip -[Image+bord rotation 20degres, avant, apres] - - Sometimes taking the domain in consideration may not be the expected behavior. If you do not want to use the extension/border for a specific routine, simply restrict the image to its domain. @@ -716,9 +713,9 @@ %================================================ -\doxysection{imamorphed}{Morphed images} -//FIXME: Write it! -// Pas concrete, light, how to concrete +%\doxysection{imamorphed}{Morphed images} +%//FIXME: Write it! +%// Pas concrete, light, how to concrete % @@ -729,7 +726,7 @@ \hline Return Type & Name & Arguments & Const & Comments \\ \hline -I::pvset & domain & - & X - & \\ \hline +I::pvset & domain & - & X & \\ \hline const Value\& & operator() & const point\& p & X & Used for reading. \\ \hline Value\& & operator() & const point\& p & - & Used for writing. \\ \hline bool & has & const Point\& p & X & \\ \hline @@ -765,6 +762,7 @@ \doxycode{ima-load} Note that each format is associated to specific image value types: + \begin{tabular}{|l|l|} \\hline Format & Value type \\ \hline @@ -786,12 +784,12 @@ \doxycode{ima2d-2} -Img1a has no data and its definition domain is still unset. We do +\var{img1a} has no data and its definition domain is still unset. We do not know yet the number of sites it contains. However, it is really useful to have such an "empty image" because it is a placeholder for the result of some processing, or another image. Trying to access the site value from an empty image leads to an error at run-time. -Img1b is defined on a domain but does not have data yet.\\ +\var{img1b} is defined on a domain but does not have data yet.\\ An image can also be created and initialized at the same time: \doxycode[1]{labeling-compute} @@ -803,9 +801,9 @@ Sometimes, you may want to initialize an image from another one: \doxycode{ima2d-7} \var{img2b} is declared without specifying a domain. Its border size is set to -the default one, e.g 0. By using \code{initialize} \var{img2b} is initialized +the default one, e.g 0. By using \code{initialize()}, \var{img2b} is initialized with the same domain and border/extension as \var{img2a}. The data is not - copied though. Other routines like \code{data::fill} can be called in order to + copied though. Other routines like \code{data::fill()} can be called in order to do so (See also \doxyref{fillop}). @@ -856,11 +854,11 @@ %================================================ -\doxysection{imaconvvals}{Conversion of image values} +%\doxysection{imaconvvals}{Conversion of image values} -parler de level::compute/level::apply. -parler de i2v et v2v. -Voir les vset => attendre que ca soit ameliore? +%FIXME: Parler de level::compute/level::apply. +% Parler de i2v et v2v. +% Voir les vset => attendre que ca soit ameliore? %==================================== \clearpage @@ -872,7 +870,7 @@ \doxychapter{winneigh}{Structural elements: Window and neighborhood} In Olena, there are both the window and neighborhood concept. A window can be -defined on any sites around a central site which may also be included. +defined on any site around a central site which may also be included. A neighborhood is more restrictive and \must not include the central site. Therefore these two concepts are really similar and are detailed together in this section. @@ -939,8 +937,8 @@ These predefined windows can be passed directly to a function. The headers are located in \header{mln/core/alias/window*.hh}. -\doxysubsection{wwindow}{Weighted window} -FIXME +%\doxysubsection{wwindow}{Weighted window} +%FIXME \doxysubsection{neighborhood}{Neighborhood} @@ -980,15 +978,15 @@ While creating a windows thanks to a bool array/matrix, the window's center is the central site of the array/matrix. -\textbf{This way of defining a window is very powerful since it enables the possibility -of having non-square windows such as:} - +%\textbf{This way of defining a window is very powerful since it enables the possibility +%of having non-square windows such as:} +%FIXME -\subsubsection{Neighborhood} -\doxysubsection{sitedepse}{Site dependent structural elements} +%\doxysubsection{sitedepse}{Site dependent structural elements} +%FIXME \doxysubsection{convneighwin}{Conversion between Neighborhoods and Windows} @@ -1010,7 +1008,7 @@ %************************** \doxysection{sitessite}{Need for site} -As we have seen before, an image is defined on a grid. It has associated +As we have seen before, an image is usually defined on a grid. It has associated data and a site set which defines the domain of the image on that grid. Usually, we need to access a value by its coordinates. With default images it can be done easily, at no cost. @@ -1049,7 +1047,7 @@ Now, create a point-wise image from this function and this \type{p\_array}: \doxycode[1]{mln_var} -Ima is actually that image: +\var{ima} is actually that image: \doxyoutput{ima2d-display-2} However, in memory, since it is based on a \type{p\_array}, sites are stored in a @@ -1092,7 +1090,7 @@ inheritance, we fetch an interface and an implementation that delegates to the site. -For instance, in the last example, \type{I::psite} has a method \code{row(}) because +For instance, in the last example, \type{I::psite} has a method \code{row()} because \type{I::site}, \type{point2d}, provides such a method. How it works: a \type{psite} inherits from \type{internal::site\_impl$<$site$>$} which is @@ -1180,7 +1178,7 @@ site sets. Here follow an example with the implemantions of the most basic routines which -use the \code{for\_all} loop: \code{data::fill()} and \code{data::paste()}. +use the \code{for\_all()} loop: \code{data::fill()} and \code{data::paste()}. \doxycode{fill} @@ -1230,7 +1228,7 @@ name to designate an image: \doxycode{ima2d-5} -If a deep copy of the image is needed, a duplicate() routine is available: +If a deep copy of the image is needed, a \code{duplicate()} routine is available: \doxycode{ima2d-6-clone} Output: \doxyoutput{ima2d-6-clone} @@ -1241,7 +1239,7 @@ \clearpage \newpage \doxychapter{basicops}{Basic routines} -//FIXME : illustrer +%FIXME : illustrer \begin{tabular}{l|p{8cm}} \hline @@ -1272,14 +1270,10 @@ \doxycode[2]{fill-call-1} -The ``\code{fill}'' algorithm is located in the sub-namespace "\namespace{mln::data}" since this +The \code{fill()} algorithm is located in the sub-namespace "\namespace{mln::data}" since this algorithm deals with the site values. -Note that the term "level" refers to the fact that an image can be considered as -a landscape where the elevation at a particular location/site is given by -the corresponding site value. - -The full name of this routine is ``\namespace{mln::data::fill}''. +The full name of this routine is \code{mln::data::fill()}. To access to a particular algorithm, the proper file shall be included. The file names of algorithms strictly map their C++ name; so \namespace{mln::data::fill} is defined in the file \header{mln/data/fill.hh}. @@ -1290,8 +1284,8 @@ algo(input)", where the input image is only read. However some few algorithms take an input image in order to modify it. To enforce this particular feature, the user shall explicitly state that the image is provided so that its data is -modified "read/write". The algorithm call shall be ``\code{data::fill(ima.rw(), -val)}''. When forgetting the ``\code{rw()}'' call it does not compile. +modified "read/write". The algorithm call shall be \code{data::fill(ima.rw(), +val)}. When forgetting the \code{rw()} call, it does not compile. \doxycode[3]{fill-call-1} @@ -1304,13 +1298,13 @@ Output: \doxyoutput{paste-call-1} -Before pasting, the couple of images looked like: +%Before pasting, the couple of images looked like: -//FIXME : ajouter des zolies zimages. +%FIXME : ajouter des zolies zimages. -so after pasting we get: +%so after pasting we get: -//FIXME : ajouter des zolies zimages again. +%FIXME : ajouter des zolies zimages again. %---------------- \subsection*{Note} @@ -1326,7 +1320,7 @@ The notion of site sets plays an important role in Olena. Many tests are performed at run-time to ensure that the program is correct. -For instance, the algorithm data::paste tests that the set of sites of imgb +For instance, the algorithm \code{data::paste()} tests that the set of sites of \var{imgb} (whose values are to be pasted) is a subset of the destination image. @@ -1334,7 +1328,7 @@ %==================================== \doxysection{blobs}{Blobs} -\code{Labeling::blobs()} is used to label an image. It returns a new image with the +\code{labeling::blobs()} is used to label an image. It returns a new image with the component id as value for each site. The background has 0 as id therefore the component ids start from 1. @@ -1378,7 +1372,7 @@ This small routine only works on binary images. It performs a point-wise "logical not" and therefore "negates" the image. There are two versions of that -algorithm a version which returns a new image and another which works in place. +algorithm: a version which returns a new image and another which works in place. Example: Make a binary image: @@ -1499,7 +1493,7 @@ Then, use \code{labeling::compute()} with the bbox accumulator: \doxycode[3]{labeling-compute} -\code{Labeling::compute()} hold an accumulator for each component, which means it +\code{labeling::compute()} hold an accumulator for each component, which means it returns an array of accumulator results. In this case, it returns an array of \type{box2d}. @@ -1532,8 +1526,8 @@ %==================================== \doxysection{partima}{Working with parts of an image} -Sometime it may be interesting to work only on some parts of the image or to -extract only a sub set of that image. Olena enables that thoughout out the +Sometimes it may be interesting to work only on some parts of the image or to +extract only a sub set of that image. Olena enables that through the operator '$|$'. Three kinds of that operator exist:\\ @@ -1552,7 +1546,7 @@ A Sub Domain can be a site set, an image or any value returned by this operator. For a given site, \type{Function\_p2v} returns a value and \type{Function\_p2b} returns a -boolean. These functions. are actually a sort of predicate. A common +boolean. These functions are actually a sort of predicate. A common \type{Function\_p2v} is \code{pw::value(Image)}. It returns the point to value function used in the given image. C functions can also be used as predicate by passing the function pointer. @@ -1569,7 +1563,7 @@ The returned value type \type{V} for \type{Function\_p2v} depends on the image value type. With \type{image2d$<$int$>$}, \type{V} would be \type{int}. -In this section, all along the examples, the image "\var{ima}" will refer to the +In this section, all along the examples, the image \var{ima} will refer to the following declaration: \doxycode[1]{fill-part-image} Output: @@ -1656,13 +1650,14 @@ operator: \doxyrawcode{ima2d-restricted-3} -In that case there is no restriction on the domain at all and the following example will work. -\doxycode[3]{mln_var} -Output: -\doxyoutput{mln_var} +%FIXME +%In that case there is no restriction on the domain at all and the following example will work. +%\doxycode[3]{mln_var} +%Output: +%\doxyoutput{mln_var} -With this operator, an intersection is applied on the image domain and the -site set. +%With this operator, an intersection is applied on the image domain and the +%site set. @@ -1682,15 +1677,15 @@ \doxysection{ioim}{ImageMagick} \href{http://www.imagemagick.org}{http://www.imagemagick.org} - + \newline{} You have to install ImageMagick with Magick++ support. You will be able to load every file recognized as an image by ImageMagick. - + \newline{} Olena only support binary and 8 bits images through ImageMagick. - + \newline{} During the compilation, you will have to specify the ImageMagick flags and libraries. - + \newline{} To do so, just add the following line to your compilation: \begin{verbatim} @@ -1702,7 +1697,7 @@ \doxysection{iodcm}{GDCM} \href{http://apps.sourceforge.net/mediawiki/gdcm}{http://apps.sourceforge.net/mediawiki/gdcm} - + \newline{} GDCM is a library for manipulating DICOM files. DICOM files are used in medical imaging. @@ -1715,7 +1710,7 @@ %\end{htmlonly} \doxychapter{graphandima}{Graphes and images} -FIXME: REWRITE +%FIXME: REWRITE %************************** \doxysection{graphdesc}{Description} @@ -1724,7 +1719,7 @@ relationship. Specific data can be associated to each vertex and/or edges. -//FIXME: Add more explanations? +%FIXME: Add more explanations? %************************** \doxysection{graphexample}{Example} @@ -1752,7 +1747,7 @@ \doxycode[5]{graph-data} Thanks to the \type{p\_vertices} there is now a mapping between vertices and sites. -We may like to map data to it. The idea is to provide a function which returns +We may want to map data to it. The idea is to provide a function which returns the associated data according to the site given as parameter. Combining this function and the \type{p\_vertices}, we get an image which can be used with algorithms and \code{for\_all} loops. @@ -1793,28 +1788,28 @@ Output: \doxymoutput[4]{graph-iter} -//FIXME talk about p\_vertices and p\_edges. +%FIXME talk about p\_vertices and p\_edges. %==================================== -\newpage -\clearpage -\doxychapter{funs}{Functions} +%\newpage +%\clearpage +%\doxychapter{funs}{Functions} -FIXME write it +%FIXME write it %==================================== -\newpage -\clearpage -\doxychapter{arithmops}{Arithmetical operators} +%\newpage +%\clearpage +%\doxychapter{arithmops}{Arithmetical operators} -FIXME write it +%FIXME write it %==================================== -\newpage -\clearpage -\doxychapter{mathtools}{Mathematical tools} +%\newpage +%\clearpage +%\doxychapter{mathtools}{Mathematical tools} -FIXME write it +%FIXME write it %==================================== \newpage @@ -1970,14 +1965,14 @@ %==================================== -\newpage -\clearpage +%\newpage +%\clearpage %Ugly workaround to avoid missing chapter references in doxygen. %\begin{htmlonly} %\doxychapter{2}{} %\end{htmlonly} -\doxychapter{debugtools}{Debugging tools} +%\doxychapter{debugtools}{Debugging tools} -FIXME write it +%FIXME write it \end{document}

1 0