* doc/examples/Makefile.am: fix the script comparing reference files and new produced files. * doc/examples/split/tuto3_first_routine-1.cc, * doc/examples/split/tuto3_first_routine-5.cc, * 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: Update reference files. --- milena/ChangeLog | 16 ++++++++++++++++ milena/doc/examples/Makefile.am | 8 ++++---- milena/doc/examples/split/tuto3_first_routine-1.cc | 2 +- milena/doc/examples/split/tuto3_first_routine-5.cc | 2 +- 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 9 files changed, 22 insertions(+), 6 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 9acd79e..04066f3 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,21 @@ 2009-06-15 Guillaume Lazzara <guillaume.lazzara@lrde.epita.fr> + Update doc reference files. + + * doc/examples/Makefile.am: fix the script comparing reference files + and new produced files. + + * doc/examples/split/tuto3_first_routine-1.cc, + * doc/examples/split/tuto3_first_routine-5.cc, + * 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: Update reference + files. + +2009-06-15 Guillaume Lazzara <guillaume.lazzara@lrde.epita.fr> + Make labeling::colorize deterministic. * mln/labeling/colorize.hh: use our own random generator. diff --git a/milena/doc/examples/Makefile.am b/milena/doc/examples/Makefile.am index 66468bd..356336e 100644 --- a/milena/doc/examples/Makefile.am +++ b/milena/doc/examples/Makefile.am @@ -157,25 +157,25 @@ diff-data: run-examples split-examples txtlist="$(OUTPUTS_BUILDDIR)/*.txt"; for txt in $$txtlist; do \ echo "Diff `basename $$txt`"; \ diff $$txt $(OUTPUTS_SRCDIR)/`basename $$txt` >/dev/null 2>&1 \ - || has_txt_diff+=" `basename $$txt`"; \ + || has_txt_diff="$$has_txt_diff `basename $$txt`"; \ done; \ has_fig_diff=""; \ figlist="$(FIGURES_BUILDDIR)/*.p*m"; for fig in $$figlist; do \ echo "Diff `basename $$fig`"; \ diff $$fig $(FIGURES_SRCDIR)/`basename $$fig` >/dev/null 2>&1 \ - || has_fig_diff+=" `basename $$fig`"; \ + || has_fig_diff="$$has_fig_diff `basename $$fig`"; \ done; \ has_split_out_diff=""; \ split_outlist="$(SPLIT_OUTPUTS_BUILDDIR)/*"; for split_out in $$split_outlist; do \ echo "Diff `basename $$split_out`"; \ diff $$split_out $(SPLIT_OUTPUTS_SRCDIR)/`basename $$split_out` >/dev/null 2>&1 \ - || has_split_out_diff+=" `basename $$split_out`"; \ + || has_split_out_diff="$$has_split_out_diff `basename $$split_out`"; \ done; \ has_split_ex_diff=""; \ split_exlist="$(SPLIT_EXAMPLES_BUILDDIR)/*"; for split_ex in $$split_exlist; do \ echo "Diff `basename $$split_ex`"; \ diff $$split_ex $(SPLIT_EXAMPLES_SRCDIR)/`basename $$split_ex` >/dev/null 2>&1 \ - || has_split_ex_diff+=" `basename $$split_ex`"; \ + || has_split_ex_diff="$$has_split_ex_diff `basename $$split_ex`"; \ done; \ (test -z "$$has_txt_diff" && test -z "$$has_fig_diff" && \ test -z "$$has_split_out_diff" && test -z "$$has_split_ex_diff")\ diff --git a/milena/doc/examples/split/tuto3_first_routine-1.cc b/milena/doc/examples/split/tuto3_first_routine-1.cc index c9fd1ab..4470aa7 100644 --- a/milena/doc/examples/split/tuto3_first_routine-1.cc +++ b/milena/doc/examples/split/tuto3_first_routine-1.cc @@ -17,7 +17,7 @@ namespace mln V nlabels; mln_ch_value(I,V) lbl = labeling::blobs(ima, nbh, nlabels); util::array<unsigned> - count = labeling::compute(accu::meta::count(), lbl, nlabels); + count = labeling::compute(accu::meta::math::count(), lbl, nlabels); mln_concrete(I) output; initialize(output, ima); diff --git a/milena/doc/examples/split/tuto3_first_routine-5.cc b/milena/doc/examples/split/tuto3_first_routine-5.cc index 998dc2d..3d16132 100644 --- a/milena/doc/examples/split/tuto3_first_routine-5.cc +++ b/milena/doc/examples/split/tuto3_first_routine-5.cc @@ -2,4 +2,4 @@ V nlabels; mln_ch_value(I,V) lbl = labeling::blobs(ima, nbh, nlabels); util::array<unsigned> - count = labeling::compute(accu::meta::count(), lbl, nlabels); + count = labeling::compute(accu::meta::math::count(), lbl, nlabels); diff --git a/milena/doc/figures/fill-subdomain-2.ppm b/milena/doc/figures/fill-subdomain-2.ppm index 7bfa0e4c45344b8acdbefee7347dd890f15031a2..c2b8ad5041095b3cbe001c4cdf880dda6c44fc1c 100644 GIT binary patch delta 94 wcmX@dc#d&GdAMe82M{s902&u245BARZvY}7<GJ2y2p7Tza)AgU1r&h*00TJ{X#fBK 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..a59ff430a2ceecec3ffe82c0858b93d5020a8cf4 100644 GIT binary patch delta 52 bcmX@dc#d(xLS4<?4j^KH0c18%42=r_FysgI 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..c2b8ad5041095b3cbe001c4cdf880dda6c44fc1c 100644 GIT binary patch delta 94 wcmX@dc#d&GdAMe82M{s902&u245BARZvY}7<GJ2y2p7Tza)AgU1r&h*00TJ{X#fBK 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..391715375171f95fd9c18c45b748ce6691aff241 100644 GIT binary patch delta 82 tcmdnbxSw%CiMMFU95~wgTo0Lz%w+%r6{)Z}@)kg{L$m~lfD8zNZ~^;{8@m7i 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..e7bf28faa4d0213c2d901b053b81fa36318c13c0 100644 GIT binary patch literal 12406 zcmdUtv1%Px6h%|3cjLwbaS=7oNw9@+7qAHd2aE}BR6R!%Y)~Ze@(B13)TmMIKTxB_ zzv0Fo;ory!8y1^$@7$SrnU};yT=qR@pMBO`zZXXbUw1$DXZ>cq?N7Sb@4BDgp7v+! z?z`2uUH4|Yy?FBA!TH~n)#>J>U-cJnx9in!o0xj`;-_DJ=w9}J^y|&9Z@Tr_N%yq> zvp+q*_`N^dcF)(Z&m;7F^RD~m`OBxz4iAnVc1I5nzJK)S;PC3Q`uElRf7i#i@i%?0 zx|d?)gl?yOUftk#(VkkW>l>?j$|npBE(O`nscxtEKj(+DAx1x;I@^A<S>2DHJ~aH* z?Otrms^w<%=v2cnD+F^@#FnUYR+lm;o32%7qew_q>^7*W2uvcSIWXIkXXuK5il~N^ zgQYDzQPerqRh_ib)~GNwD$0;@#68~iy6f<8#ZP6TU~p8VK>Vu5H3VnsrrGj3*Y63; zRt3)JqC;R-k*f>$Cw>3!E3Yu+#VMM>QpC85<iyo=+4T^dNd&q6yw0E(M>SKUf~asx zGeRqbx@vjd^?$+-c7pV}ASc4_@cT)-v}pRt8!CrEuhXLFf|uXn_oHM_a}7*eFyb~9 zRdE9vu{eJ$jc|vVt9=|T5vTu4@NxAnd%fsds9up~a4Au)h)M~+2>(*dp0hvx*y7>7 zbaCyAs*k_J`#b+WfXQ_D&|d^U@cv2-_<#8Rk?b2AT94T<sD({}bLjDR=8ts|KEwk? zq8jomjX<y^8t}XEYh4wF)p($)`pY5-hz0q9K>(l%OA#2VBIPiJXv5Eaf7U7Ak<{WW z4Q@ueO*)<b0)N^V*T7Q|&W6BQ=0s(${MC&@jaGx%TMCIvnKlZ)!|#W6)r~MXVOtZ( zEMl+x+VcM1W7fH7GkaH4QStH6Q{d;mf4QZ~?|9NcrdDG1>$3d5S6hO76yABH%N#uE zG55jGE{Qh3n*&={_~R;#ZGZe}X>8Qvm;A}e71Xj)<)8TY>5~a3Gej!JRb738J24}e z9TGn7FiY|KUZ}LR<d<1pA9PKKn>Dfz{<JQZY8R*fgc6ctqf;O`Ar|LnX%fB^etEo= zrsAruMCpfr;*TeNa$MQSA}TJ_^|OTWG-k_K51Ga9gJ>3oD0k7tk5G&2&@6^()Smcb zDeFp3TCgE#4GEkGeM0;9gSiyGNL?z8YnelZ@v6Xv*atu16B+P_(1=$kMl03h+J1R` zT{%T15k{RYspVJ3tAYfjF<3RX`Ku#dBwS0=>0PvsSGAn9(v`ZzKKNMyGlEt_V0JO& zUzR^@ae&aN+qkB|#_V){oW8fcsNMCPq^A!CRm{Sc1hJ}fMff6$2=AilHU#D*%8?SR z{DkDWyt9ozMOE`}53iydEuG1udP(Aya>Og{ENSURD|CX7ium;j9$N)dan#1r5Xqdb zGT=}AC9S>!zXbmUWjM~8>tpHU(G^=Ms(vrVNL)2I#1A&Y7ghP)ko3^@Wb><!BptRk zzdkB#Rrsin@_+ceau{uNjMS}O-S67XLQN-zS^T^S<1U5(+#^knkGPiY)yGdE61lE2 z48cd2_YY07riM;zA%;ApVel!}VHo0%mdNMwx4~d*+XOj<ACG|b@}uOMn*09g>3nt4 zIH^-{q3+}Rcd<$E6^+Lar}*OxO>Bxv*NHX)eVkbrVJP{ds88_mQt!YYA=+N1r3#SL zskn&l5I=)1w(sw8oz8!Cc}G(d;lu2Zp?%z2z)TSiFTXw^G?~>L_;FTksYqs9C{we? hw}&ajuRHLsZmuIC`1Pl>;PKcY-NsJcp%Cf`{x1*nX*B=< 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.5.6.5