Repository : ssh://git@open-mesh.org/doc

On branches: batman-adv-doc,master

commit 2763c2af03d69782b207428af749f99ffe9c97fa Author: Simon Wunderlich siwu@hrz.tu-chemnitz.de Date: Thu Oct 9 19:57:51 2008 +0200

add formulas (plus Makefile voodoo to generate them from tex)

2763c2af03d69782b207428af749f99ffe9c97fa batman_iv.docbook | 24 +++++++++++++++++------- images/Makefile | 19 +++++++++++++++++++ images/compute_tq.tex | 6 ++++++ images/tq_prop_calc.tex | 6 ++++++ 4 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/batman_iv.docbook b/batman_iv.docbook index 8b6dddd8..26c02a8a 100644 --- a/batman_iv.docbook +++ b/batman_iv.docbook @@ -131,13 +131,19 @@ TODO Explain multiple interfaces, which interface sends which OGM by which TTL, <imageobject> <imagedata fileref="images/tq.pdf" format="EPS" scale="50" /> </imageobject> <imageobject> <imagedata fileref="images/tq.png" format="PNG" /> </imageobject> <textobject> <phrase>Transmit Link Quality (TQ)</phrase> </textobject> - </inlinemediaobject></para> + </inlinemediaobject></para> + <para> + <inlinemediaobject> + <imageobject> <imagedata fileref="images/compute_tq.pdf" format="EPS"/> </imageobject> + <imageobject> <imagedata fileref="images/compute_tq.png" format="PNG" /> </imageobject> + <textobject> <phrase>compute the Transmit Link Quality</phrase> </textobject> + </inlinemediaobject> + </para> + </listitem> </orderedlist> - - As shown above B.A.T.M.A.N. IV is able to retrieve the local transmit quality by using the same mechanisms as B.A.T.M.A.N. III without adding further overhead. -[4 illustrations needed (for each list item and one for the tq alone)] -[??? what kind of 4th illustration? put the formular in a picture, or in the text?] + This shows that B.A.T.M.A.N. IV is able to compute the local Transmit Quality by using the same + mechanisms as B.A.T.M.A.N. III without adding further overhead. </para> </sect2> <sect2 id="batman4_tq_prop"> @@ -149,7 +155,11 @@ TODO Explain multiple interfaces, which interface sends which OGM by which TTL, To add the local link quality in the TQ value the following calculation is performed: </para> <para> - TQ incoming * local TQ towards this node / TQ max. + <inlinemediaobject> + <imageobject> <imagedata fileref="images/tq_prop_calc.pdf" format="EPS" /> </imageobject> + <imageobject> <imagedata fileref="images/tq_prop_calc.png" format="PNG" /> </imageobject> + <textobject> <phrase>TQ calcuation</phrase> </textobject> + </inlinemediaobject> </para> <para> Example: Node A broadcasts the packet with TQ max. Node B receives it, applies the TQ calculation and rebroadcasts it. When node C gets the packet it knows about the transmit quality towards node A. @@ -158,7 +168,7 @@ TODO Explain multiple interfaces, which interface sends which OGM by which TTL, <inlinemediaobject> <imageobject> <imagedata fileref="images/tq_prop.pdf" format="EPS" scale="40" /> </imageobject> <imageobject> <imagedata fileref="images/tq_prop.png" format="PNG" /> </imageobject> - <textobject> <phrase>Transmit Link Quality (TQ)</phrase> </textobject> + <textobject> <phrase>TQ propagation</phrase> </textobject> </inlinemediaobject>

diff --git a/images/Makefile b/images/Makefile index acca3164..fd71db05 100644 --- a/images/Makefile +++ b/images/Makefile @@ -1,9 +1,12 @@ GP_IMAGES=asym_penalty.gp DIA_IMAGES=asymetry.dia tq.dia eq.dia rq.dia hop_penalty1.dia hop_penalty2.dia asym_link1.dia asym_link2.dia tq_prop.dia +TEX_IMAGES=compute_tq.tex tq_prop_calc.tex PNG_IMAGES= $(DIA_IMAGES:.dia=.png) PNG_IMAGES+=$(GP_IMAGES:.gp=.png) +PNG_IMAGES+=$(TEX_IMAGES:.tex=.png) PDF_IMAGES= $(DIA_IMAGES:.dia=.pdf) PDF_IMAGES+=$(GP_IMAGES:.gp=.pdf) +PDF_IMAGES+=$(TEX_IMAGES:.tex=.pdf)

.PHONY: clean .SUFFIXES: .dia .png .eps .pdf .gp @@ -22,6 +25,22 @@ all: $(PDF_IMAGES) $(PNG_IMAGES) /usr/bin/dia -e $@ $< .eps.pdf: /usr/bin/epstopdf --outfile=$@ $< +.tex.pdf: + rm -f file_tmp.* + cp $< file_tmp.tex + latex file_tmp.tex + dvips file_tmp.dvi + ps2eps -l file_tmp.ps + epstopdf file_tmp.eps + mv file_tmp.pdf $@ + rm -f file_tmp.*

+.tex.png: + rm -f file_tmp.* + cp $< file_tmp.tex + latex file_tmp.tex + dvips -x 3000 -y 3000 -E file_tmp.dvi + convert file_tmp.ps $@ + rm -f file_tmp.* clean: rm -f *.png *.eps *.pdf diff --git a/images/compute_tq.tex b/images/compute_tq.tex new file mode 100644 index 00000000..71f7bd75 --- /dev/null +++ b/images/compute_tq.tex @@ -0,0 +1,6 @@ +\documentclass{article} +\pagestyle{empty} +\begin{document} +$EQ = RQ \cdot TQ \qquad \Rightarrow \qquad TQ = \frac{EQ}{RQ}$ +\end{document} + diff --git a/images/tq_prop_calc.tex b/images/tq_prop_calc.tex new file mode 100644 index 00000000..23b71086 --- /dev/null +++ b/images/tq_prop_calc.tex @@ -0,0 +1,6 @@ +\documentclass{article} +\pagestyle{empty} +\begin{document} +$TQ = TQ_{incoming} * TQ_{local}$ +\end{document} +