[Olena-patches] 2941: Add reference files for example outputs used in the tutorial.

* doc/doc.mk: add new path variables. * doc/tutorial/figures/ima2d-rot-1.ppm * doc/tutorial/figures/ima2d-rot-2.ppm * doc/tutorial/outputs/borderthickness.txt * doc/tutorial/outputs/dpoint-1.txt * doc/tutorial/outputs/graph-data-full.txt * doc/tutorial/outputs/ima-has.txt * doc/tutorial/outputs/ima-size.txt * doc/tutorial/outputs/ima2d-1.txt * doc/tutorial/outputs/ima2d-decl-2-blobs-full.txt * doc/tutorial/outputs/ima2d-rot.txt * doc/tutorial/outputs/labeling-compute-full.txt * doc/tutorial/outputs/logical-not.txt * doc/tutorial/outputs/paste-call-1.txt * doc/tutorial/outputs/point-1.txt: reference files. * doc/tutorial/samples/Makefile.am: diff the generated files to their reference. --- milena/ChangeLog | 24 ++++++++ milena/doc/doc.mk | 10 +++- milena/doc/tutorial/figures/ima2d-rot-1.ppm | Bin 0 -> 235320 bytes milena/doc/tutorial/figures/ima2d-rot-2.ppm | Bin 0 -> 235320 bytes milena/doc/tutorial/outputs/borderthickness.txt | 16 ++++++ milena/doc/tutorial/outputs/dpoint-1.txt | 1 + milena/doc/tutorial/outputs/graph-data-full.txt | 5 ++ milena/doc/tutorial/outputs/ima-has.txt | 7 +++ milena/doc/tutorial/outputs/ima-size.txt | 1 + milena/doc/tutorial/outputs/ima2d-1.txt | 2 + .../tutorial/outputs/ima2d-decl-2-blobs-full.txt | 7 +++ .../doc/tutorial/outputs/labeling-compute-full.txt | 3 + milena/doc/tutorial/outputs/logical-not.txt | 18 ++++++ milena/doc/tutorial/outputs/paste-call-1.txt | 4 ++ milena/doc/tutorial/outputs/point-1.txt | 2 + milena/doc/tutorial/samples/Makefile.am | 58 +++++++++++++++++--- 16 files changed, 147 insertions(+), 11 deletions(-) create mode 100644 milena/doc/tutorial/figures/ima2d-rot-1.ppm create mode 100644 milena/doc/tutorial/figures/ima2d-rot-2.ppm create mode 100644 milena/doc/tutorial/outputs/borderthickness.txt create mode 100644 milena/doc/tutorial/outputs/dpoint-1.txt create mode 100644 milena/doc/tutorial/outputs/graph-data-full.txt create mode 100644 milena/doc/tutorial/outputs/ima-has.txt create mode 100644 milena/doc/tutorial/outputs/ima-size.txt create mode 100644 milena/doc/tutorial/outputs/ima2d-1.txt create mode 100644 milena/doc/tutorial/outputs/ima2d-decl-2-blobs-full.txt create mode 100644 milena/doc/tutorial/outputs/ima2d-rot.txt create mode 100644 milena/doc/tutorial/outputs/labeling-compute-full.txt create mode 100644 milena/doc/tutorial/outputs/logical-not.txt create mode 100644 milena/doc/tutorial/outputs/paste-call-1.txt create mode 100644 milena/doc/tutorial/outputs/point-1.txt diff --git a/milena/ChangeLog b/milena/ChangeLog index 7669b73..2170ada 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,27 @@ +2008-11-21 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Add reference files for example outputs used in the tutorial. + + * doc/doc.mk: add new path variables. + + * doc/tutorial/figures/ima2d-rot-1.ppm + * doc/tutorial/figures/ima2d-rot-2.ppm + * doc/tutorial/outputs/borderthickness.txt + * doc/tutorial/outputs/dpoint-1.txt + * doc/tutorial/outputs/graph-data-full.txt + * doc/tutorial/outputs/ima-has.txt + * doc/tutorial/outputs/ima-size.txt + * doc/tutorial/outputs/ima2d-1.txt + * doc/tutorial/outputs/ima2d-decl-2-blobs-full.txt + * doc/tutorial/outputs/ima2d-rot.txt + * doc/tutorial/outputs/labeling-compute-full.txt + * doc/tutorial/outputs/logical-not.txt + * doc/tutorial/outputs/paste-call-1.txt + * doc/tutorial/outputs/point-1.txt: reference files. + + * doc/tutorial/samples/Makefile.am: diff the generated files to their + reference. + 2008-11-21 Thierry Geraud &lt;thierry.geraud(a)lrde.epita.fr&gt; Add some reference code in morpho tree. diff --git a/milena/doc/doc.mk b/milena/doc/doc.mk index d911d86..3311139 100644 --- a/milena/doc/doc.mk +++ b/milena/doc/doc.mk @@ -2,6 +2,12 @@ include $(top_srcdir)/milena/tests/tests.mk -OUTPUTS_DIR = $(top_builddir)/milena/doc/tutorial/outputs -FIGURES_DIR = $(top_builddir)/milena/doc/tutorial/figures +TUTORIAL_SRCDIR = $(top_srcdir)/milena/doc/tutorial +OUTPUTS_SRCDIR = $(TUTORIAL_SRCDIR)/outputs +FIGURES_SRCDIR = $(TUTORIAL_SRCDIR)/figures + +TUTORIAL_BUILDDIR = $(top_builddir)/milena/doc/tutorial +OUTPUTS_BUILDDIR = $(TUTORIAL_BUILDDIR)/outputs +FIGURES_BUILDDIR = $(TUTORIAL_BUILDDIR)/figures + diff --git a/milena/doc/tutorial/figures/ima2d-rot-1.ppm b/milena/doc/tutorial/figures/ima2d-rot-1.ppm new file mode 100644 index 0000000000000000000000000000000000000000..512ff99db8f5f207b30561a082499c471cd8116d GIT binary patch literal 235320 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 X5FkK+009C72oNAZfB*pk|3lzEi5B~u literal 0 HcmV?d00001 diff --git a/milena/doc/tutorial/figures/ima2d-rot-2.ppm b/milena/doc/tutorial/figures/ima2d-rot-2.ppm new file mode 100644 index 0000000000000000000000000000000000000000..c46713d24fdf6898ab821f6945fcab91780063de GIT binary patch literal 235320 zcmeI5+iDy~6h-~)uNcTn@*+D1hmf~`O$az(OnyL)C)nV~MiBvjy;JIzW=7+gzEqv6 zI=gCt0%J$&KE2LfwMUARy#DF&cbng~SKI5$o9(;J+b^3xK78C>U2cB7c)HoVzq$GR z%abRcZhz<E<Mq4k#rE@uo6C#8uftcpeEs{Mzi!@a|J`0*|Mh-zdG&7dV*B6r<EPL6 zY_D!MuP)zy3K#u!{blq0t2ZxR{_yzO&rdhuugA}xKY#r7>mxoO009U<00Izz00bZa z0SG_<0uX=z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV= z5P$##AOHafKmY;|fB*y_a7*A39}sXxK=J>sGI+%Q6$S!M2;3g*vL1!uHK$i3&dgH; z@CXwjkWN6@qi{U%?oRT}#MHr_9_cDqz@sYIxoKkrv^}Dd=p!El@Tjqak;kb*K;9!N z$;W|QCB1%b+KflxLHtl<lHLfk;1QKXCDkU-l1EfhZ!O^Gc^mPFN~(Pz`-yawNgDHr zN~)3~ZrYAVR1%d`k3dr%p;EmdbzVt$)Oi4Sd=mn#c|;{qNi_)Ik;!qyMLH+Yphr|v zjRP5vB&kpTA)w*kOA1Fs=gZ~sixFtEkEkTc!!fK)^`mW%s3hHFYE9m(M^uvR*{)^K zIBoMDQAvuil$*I_kEkRnsT6_6Jwl~YL6U0_+kx@OmM2&1lR*0(QAt!%egb&Z=lRJ~ z+Y;!)BPuEXfovN~xvO>MQFvIn1u?J$fnGeKlBlGd1bXv`N|HF<<%aCYBPuE9fh?DN z+krduh)S}J5LXKX`tpcMqLT6u=*}Zl$`ho{TM3Uk4*-vELZC;Fs3a=MngAY|97kNF za{`@uL?u}t$ao}4H2n|w@ZS`YTzohIJ%04tM^uu_K>E~Vb}Bpy1ZFAm2@sej(6vWY z5|v~`0FQ17P)SB{nm)7}{=2<<L?vO61pz#|rAQ@NWU1l0nSC@o!lT)c@Cma7@aXO& zrjn?n1Oj+;=ux0Cd-CuJ5crk=9_<eyDrwImeACFs3Icev&&%Kum4rbN1n_9@5kI(l zz+%N|91*<6z66gRWQR(6fCH7562PP5;P742F_EQNYOG>bJq{inr-n*8CW1%v1n}rY zYN(_WQ0B9=>Hu%-lkw<uWKiie7i>CB0FO@R1&>a1Ih~@$$|d4)@aSw_Q0XihY&s@@ zM`yz_cog_VoKAd6Zv^n@tViL<p^~QP9G}U(xpVlucr=w1Drt%i9_<O>(M(dPq!~c_ zEFGTDy}ibxnV3*XGl1~umH-~j$An6nXVkk*c(f=ZsI&-Ezc%5~qJZGhB20Ls_I+Up zcHyO=QfcCa7o2oE`e<o7@MtNiq(BxwA8n?^qZR2ur4_Jj@~NT~9<7MR;87r^vRvjY zMgWgicodFUDrp_BURnu{*5!gqTE`2IidACNjVivkqLNVQ8v^vvH%R8Zrjk}8YrmE7 zC?*tCQVg}0ZNj6-M4(b6xHfIVqsTbmQ6xA#n)}9~B%u)FlD9i~FI1|(gOiJ?@SF5e zd=~I1o?V5gXFYlGC@Bl5l!UJxoA4+p2!ls~Vb-&bi~A>lM@b%q1C>fjCD=kM;ZbS| zsH9YacvP=%UA>c{lDb!kJ~D^^m1F=>yOr?BCIVEF4M$a*@W^ccsAPsx&n7%FTRt9{ zp~Rz7KY0kDbqE`kJZ_~#Q0ODe&Et_J%@X;yI*#$kc=M=a3{=A=JThMU;8CDzb<lAg z2?BUz>`^#AsU&-*-dhQe>~~Hj*)zqXJhklneG`?`nM(9gmW5MES+M$TB|OTta4IPm zS&ug1QO0efQbxGGY{H|AtHz^@aPi3ECl4W_zCfOt2bDDTlo}@bDDR%}C@<gC{GU1g zR$ms6vhNv{vLjv{dn<i**TJLgOCCH5oOjH5(H;Rj%I;A(EUBatlxwyU9+lWIl~jT< z9<A?rxpzraQqwBYM}^i)B^3f)r<L%i+<K{`a;!_+ghxepi%Latm$M0viY^w9isHtj zxt~0QK$e4KdM{K`-P}~*=%dnG#iP>1r}A%gMB-6}t)fx|=y`3zqY5h>JPPEk4nwX} zod6zH@F*OOR8k%8xmpR2>g<zBs>2<R9#(e)?}@0ShE$@Dsx6aBs)pXamGG$MGO47R z^et_|qsp5^rOFGiu?deVuMv+bF944o{^Y@iM~!QulD<mxQT-j_QT-jHp2B$KVuz^Y zVh!;&;gO344jzSF)OcGNA0DRN5x^rC9)&DZNnSP)bFko%m+etWUN(V8yPDN}K_zLb zG`^RRoW05KB&Z~{Eba{w4W#JUvu_y&l{DLQ_Su^HguOxIV~GY*bnGQjLM7j=bZihF zElG9x&%q<F9-TG_kIFl;@Q$eDOr<G<@MvMG%YPakdGcspqL7fVvhq1ezoY2b%O4z- z9OQD5LE}zE11UQ8N{_-GHIKRF&*}6tR~UpxPIq{(4wY1+l2#jpM+zQMN%zM}_H9KP zgh$yolN<pmsYoRy8H7h79#Kij=h4)r4I~Pe7yU+7bnK~po(T(;l&z9%3>tST8c5Nx zBRm?<I(~3xYLlfwcodiF@?S+I*-2z?5FV8`BKnS~l&n%NgYYOi)#bksj}kn}YY-ll z*CFMOs1&7A35mj5!*)`ZTkC5@$4<dDcog=fxv-QckNny~2948+u0?e0$VA+$GpKa` zi^OZS{N+Ur!XvpT4IWWR6DLUpgYZbsqcAX)bmsezY6jtvtVdMRVI@^I2#*v!3Nuql z2bJVPqH!sTaSB;d9NTJURQekB@9C$_qJb108;>lGKVJroI~5J2=-5^sh3f<Y{r$5f zj|Sn9VXDhtYVfEZmHZlnN9DtBd&fR1>CPbM??9Z7cP@CMW1oARxZfW<YP*uW*U)Zp zqJb10dxzcX#h_A?Kf9DMXk4XeAVtTv(r0&_!K211Nz5QT+NDwYMMIS&X%HSs>vK4~ zzDmLd;n86frC%$1bZ1a_1oagt&aaN$oVlh-@-?*Eqi7&S$KGK#f1&14I|hxb6b+>4 z*yj2iUQk4()(pa<!w@#`dhjTu)a`c~Z5o6}4Y+gk2wp3xWrOhOD1;6C(qARr8RWMl zjoMrE0Y%3ypz5HKQ8-e^ZNG+gghT@=I`$5Gz88Z>A;5K2>d2sRm6dtNZd-KheEJ+- zc~B{q?BRuCUUz5E2uU=MqGQJdGfIdWDs^fQ9u-S<`5Tq>sB44psC>Lj-m!>EcLwqH zK$L*!*ll@44ekGIt!N-c$1dqnxL2T*=LdHfv^Qwnsc0ZY$FAX#tx6blY!Dt5PIZ;r z*;Nt-oi+%Mssy|6O$Uz>D+z<948o(rk*;;Sgi5+Ih<DMmyAwquI`-^3a(u$zQA8zC zL-RGX+m~n{MaSM@FZ^OqY55<Fz@QZdjjI$5r0Cd%^*OxVGL<lBwLy4v7_;VI&v}GF zkp|&W^X?oy;2D)LD9Io^I*M8IzdYp;5*bJok`ve}=0|kw>ZlJ?!XV4!iw073Y#$zB zkflN6PDKMLI(BuB!T_Mlu?118qGRXSAlLLjKs1n|V|&;*Gvpv38c5Nxb8L`ndLSSg zNYSx9Y@8W#5D*Qd=-4?n$Td9>5Dld0*d8{{3^@ph22ynF92?}C9temAQgmz&8)t?b z1VjTVI(Ci?a!n5eL<1>0wug-~Lk<F>ffOA(#|F8k2Lhsj6dl{c#+e}p0ntE;j-6wJ zT+;&q(Ljoh?P250kb{6|AVtT{u|clsfq-ZrMaTBAac0OtKs1n|W9Qf)*YrR@G?1cW zd)PQL<RBm#NYSx#Y>;buARrn@(Xl;joEdTu5Dld0*f}=HH9Zgz4W#JU9yZPlIS7ab zQgrMb8|0cE2#5w!bZieBXNDXEL<1>0c8(2lO%DV_0~yBV0|KrHc+i;{AOHafKmY;| zfB*y_009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_009U< z00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_009U<00Izz00bZa b0SG_<0uX=z1Rwwb2tWV=5P$##91!>)W)sP> literal 0 HcmV?d00001 diff --git a/milena/doc/tutorial/outputs/borderthickness.txt b/milena/doc/tutorial/outputs/borderthickness.txt new file mode 100644 index 0000000..94f4df7 --- /dev/null +++ b/milena/doc/tutorial/outputs/borderthickness.txt @@ -0,0 +1,16 @@ +- - - - - - - - - +- - - - - - - - - +- - - - - - - - - +- - - - | | - - - +- - - | - - - - - +- - - | | - - - - +- - - - - - - - - +- - - - - - - - - +- - - - - - - - - + +=========== + +- | | +| - - +| | - + diff --git a/milena/doc/tutorial/outputs/dpoint-1.txt b/milena/doc/tutorial/outputs/dpoint-1.txt new file mode 100644 index 0000000..8982f0f --- /dev/null +++ b/milena/doc/tutorial/outputs/dpoint-1.txt @@ -0,0 +1 @@ +(0, 1) diff --git a/milena/doc/tutorial/outputs/graph-data-full.txt b/milena/doc/tutorial/outputs/graph-data-full.txt new file mode 100644 index 0000000..6bfffae --- /dev/null +++ b/milena/doc/tutorial/outputs/graph-data-full.txt @@ -0,0 +1,5 @@ +graph_vertices_ima((0, 0)) = 10 +graph_vertices_ima((2, 2)) = 11 +graph_vertices_ima((0, 4)) = 12 +graph_vertices_ima((4, 3)) = 13 +graph_vertices_ima((4, 4)) = 14 diff --git a/milena/doc/tutorial/outputs/ima-has.txt b/milena/doc/tutorial/outputs/ima-has.txt new file mode 100644 index 0000000..598cd04 --- /dev/null +++ b/milena/doc/tutorial/outputs/ima-has.txt @@ -0,0 +1,7 @@ +ima1.has(0, 0) : 1 +ima1.has(-3, 0) : 1 +ima1.has(2, 5) : 1 +========= +ima2.has(0, 0) : 1 +ima2.has(-3, 0) : 0 +ima2.has(2, 5) : 0 diff --git a/milena/doc/tutorial/outputs/ima-size.txt b/milena/doc/tutorial/outputs/ima-size.txt new file mode 100644 index 0000000..333c6f9 --- /dev/null +++ b/milena/doc/tutorial/outputs/ima-size.txt @@ -0,0 +1 @@ +nrows = 11 - ncols = 13 diff --git a/milena/doc/tutorial/outputs/ima2d-1.txt b/milena/doc/tutorial/outputs/ima2d-1.txt new file mode 100644 index 0000000..2a65d2f --- /dev/null +++ b/milena/doc/tutorial/outputs/ima2d-1.txt @@ -0,0 +1,2 @@ +b = [(-2, -3)..(3, 5)] +domain = [(-2, -3)..(3, 5)] diff --git a/milena/doc/tutorial/outputs/ima2d-decl-2-blobs-full.txt b/milena/doc/tutorial/outputs/ima2d-decl-2-blobs-full.txt new file mode 100644 index 0000000..b48c715 --- /dev/null +++ b/milena/doc/tutorial/outputs/ima2d-decl-2-blobs-full.txt @@ -0,0 +1,7 @@ +0 1 1 0 0 +0 1 1 0 0 +0 0 0 0 0 +2 2 0 3 0 +2 0 3 3 3 +2 0 0 0 0 + diff --git a/milena/doc/tutorial/outputs/ima2d-rot.txt b/milena/doc/tutorial/outputs/ima2d-rot.txt new file mode 100644 index 0000000..e69de29 diff --git a/milena/doc/tutorial/outputs/labeling-compute-full.txt b/milena/doc/tutorial/outputs/labeling-compute-full.txt new file mode 100644 index 0000000..174807d --- /dev/null +++ b/milena/doc/tutorial/outputs/labeling-compute-full.txt @@ -0,0 +1,3 @@ +[(0, 1)..(1, 2)] +[(3, 0)..(5, 1)] +[(3, 2)..(4, 4)] diff --git a/milena/doc/tutorial/outputs/logical-not.txt b/milena/doc/tutorial/outputs/logical-not.txt new file mode 100644 index 0000000..42391a7 --- /dev/null +++ b/milena/doc/tutorial/outputs/logical-not.txt @@ -0,0 +1,18 @@ +ima: +| - +- | + +---- +ima_neg: +- | +| - + +ima: +| - +- | + +---- +not_inplace(ima) +- | +| - + diff --git a/milena/doc/tutorial/outputs/paste-call-1.txt b/milena/doc/tutorial/outputs/paste-call-1.txt new file mode 100644 index 0000000..a09b521 --- /dev/null +++ b/milena/doc/tutorial/outputs/paste-call-1.txt @@ -0,0 +1,4 @@ +b b b b +b b b b +b b b b + diff --git a/milena/doc/tutorial/outputs/point-1.txt b/milena/doc/tutorial/outputs/point-1.txt new file mode 100644 index 0000000..39f77d0 --- /dev/null +++ b/milena/doc/tutorial/outputs/point-1.txt @@ -0,0 +1,2 @@ +has(p1)? false +has(p2)? true diff --git a/milena/doc/tutorial/samples/Makefile.am b/milena/doc/tutorial/samples/Makefile.am index dcbf13c..43a5877 100644 --- a/milena/doc/tutorial/samples/Makefile.am +++ b/milena/doc/tutorial/samples/Makefile.am @@ -5,6 +5,7 @@ include $(top_srcdir)/milena/doc/doc.mk bin_PROGRAMS = \ borderthickness \ dpoint-1 \ + graph-data-full \ ima-has \ ima-size \ ima2d-1 \ @@ -17,6 +18,7 @@ bin_PROGRAMS = \ borderthickness_SOURCES = borderthickness.cc dpoint_1_SOURCES = dpoint-1.cc +graph_data_full_SOURCES = graph-data-full.cc ima_has_SOURCES = ima-has.cc ima_size_SOURCES = ima-size.cc ima2d_1_SOURCES = ima2d-1.cc @@ -27,15 +29,53 @@ logical_not_SOURCES = logical-not.cc paste_call_1_SOURCES = paste-call-1.cc point_1_SOURCES = point-1.cc -all: - mkdir -p $(OUTPUTS_DIR) - mkdir -p $(FIGURES_DIR) - @failcom='exit 1'; \ - list='$(bin_PROGRAMS)'; for bin in $$list; do \ - echo "Running $$bin"; \ - ./$$bin > $(OUTPUTS_DIR)/$$bin.txt || eval $$failcom; \ - done; +all: clean-png-figures + mkdir -p $(OUTPUTS_BUILDDIR) + mkdir -p $(FIGURES_BUILDDIR) + @failcom='exit 1'; \ + list='$(bin_PROGRAMS)'; for bin in $$list; do \ + echo "Running $$bin"; \ + ./$$bin > $(OUTPUTS_BUILDDIR)/$$bin.txt || eval $$failcom; \ + done; \ + has_txt_diff=""; \ + txtlist="$(OUTPUTS_BUILDDIR)/*"; for txt in $$txtlist; do \ + echo "Diff `basename $$txt`"; \ + diff $$txt $(OUTPUTS_SRCDIR)/`basename $$txt` >/dev/null 2>&1 \ + || has_txt_diff+=" `basename $$txt`"; \ + done; \ + has_fig_diff=""; \ + figlist="$(FIGURES_BUILDDIR)/*"; for fig in $$figlist; do \ + echo "Diff `basename $$fig`"; \ + diff $$fig $(FIGURES_SRCDIR)/`basename $$fig` >/dev/null 2>&1 \ + || has_fig_diff=" `basename $$fig`"; \ + done; \ + (test -z "$$has_txt_diff" && test -z "$$has_fig_diff") \ + || (echo "--------"; \ + echo "ERROR: please check if the tutorial needs an update.";\ + echo " The following files differ from their \ +reference or their reference file does not exist:"; \ + echo "--------"; \ + echo "* Outputs:"; \ + echo ""; \ + echo "$$has_txt_diff"; \ + echo ""; \ + echo "--------"; \ + echo "* Figures:"; \ + echo ""; \ + echo "$$has_fig_diff"; \ + echo ""; \ + echo "--------"; \ + echo "* Please update the reference files located in:"; \ + echo ""; \ + echo " $(OUTPUTS_SRCDIR)"; \ + echo " $(FIGURES_SRCDIR)"; \ + echo ""; \ + eval $$failcom); + clean-local: - rm -Rf $(OUTPUTS_DIR) $(FIGURES_DIR) + rm -Rf $(OUTPUTS_BUILDDIR) $(FIGURES_BUILDDIR) +## Clean up converted images. (*.p*m -> *.png) +clean-png-figures: + rm -f $(FIGURES_BUILDDIR)/*.png -- 1.5.6.5