Merge branch 'master' of mojotrollz.eu:college

This commit is contained in:
senft-desktop 2012-12-18 12:51:05 +01:00
commit 33163b3bea
9 changed files with 113 additions and 58 deletions

View File

@ -53,8 +53,10 @@
\@writefile{nav}{\headcommand {\beamer@framepages {11}{11}}}
\@writefile{nav}{\headcommand {\slideentry {2}{0}{12}{12/12}{}{0}}}
\@writefile{nav}{\headcommand {\beamer@framepages {12}{12}}}
\@writefile{nav}{\headcommand {\beamer@partpages {1}{12}}}
\@writefile{nav}{\headcommand {\beamer@subsectionpages {7}{12}}}
\@writefile{nav}{\headcommand {\beamer@sectionpages {7}{12}}}
\@writefile{nav}{\headcommand {\beamer@documentpages {12}}}
\@writefile{nav}{\headcommand {\def \inserttotalframenumber {12}}}
\@writefile{nav}{\headcommand {\slideentry {2}{0}{13}{13/13}{}{0}}}
\@writefile{nav}{\headcommand {\beamer@framepages {13}{13}}}
\@writefile{nav}{\headcommand {\beamer@partpages {1}{13}}}
\@writefile{nav}{\headcommand {\beamer@subsectionpages {7}{13}}}
\@writefile{nav}{\headcommand {\beamer@sectionpages {7}{13}}}
\@writefile{nav}{\headcommand {\beamer@documentpages {13}}}
\@writefile{nav}{\headcommand {\def \inserttotalframenumber {13}}}

Binary file not shown.

View File

@ -1,4 +1,4 @@
This is pdfTeX, Version 3.1415926-2.3-1.40.12 (TeX Live 2011) (format=pdflatex 2011.7.3) 10 DEC 2012 10:08
This is pdfTeX, Version 3.1415926-2.3-1.40.12 (TeX Live 2011) (format=pdflatex 2011.7.3) 10 DEC 2012 11:35
entering extended mode
restricted \write18 enabled.
%&-line parsing enabled.
@ -1102,99 +1102,119 @@ File: circular/1.pdf Graphic file (type pdf)
<use circular/1.pdf>
Package pdftex.def Info: circular/1.pdf used on input line 26.
(pdftex.def) Requested size: 250.93842pt x 222.62212pt.
LaTeX Font Info: Try loading font information for U+msa on input line 26.
[1
(/usr/local/texlive/2011/texmf-dist/tex/latex/amsfonts/umsa.fd
File: umsa.fd 2009/06/22 v3.00 AMS symbols A
)
LaTeX Font Info: Try loading font information for U+msb on input line 26.
(/usr/local/texlive/2011/texmf-dist/tex/latex/amsfonts/umsb.fd
File: umsb.fd 2009/06/22 v3.00 AMS symbols B
) [1
{/Users/Michael/Library/texlive/2011/texmf-var/fonts/map/pdftex/updmap/pdftex.m
ap} <./circular/1.pdf>] <circular/2.pdf, id=57, 680.4873pt x 674.9225pt>
ap} <./circular/1.pdf>] <circular/2.pdf, id=33, 680.4873pt x 674.9225pt>
File: circular/2.pdf Graphic file (type pdf)
<use circular/2.pdf>
Package pdftex.def Info: circular/2.pdf used on input line 39.
Package pdftex.def Info: circular/2.pdf used on input line 38.
(pdftex.def) Requested size: 220.8258pt x 219.01765pt.
[2
<./circular/2.pdf>]
<circular/3.pdf, id=89, 477.77196pt x 613.71085pt>
<circular/3.pdf, id=45, 477.77196pt x 613.71085pt>
File: circular/3.pdf Graphic file (type pdf)
<use circular/3.pdf>
Package pdftex.def Info: circular/3.pdf used on input line 53.
Package pdftex.def Info: circular/3.pdf used on input line 51.
(pdftex.def) Requested size: 170.0pt x 218.36986pt.
[3
<./circular/3.pdf>] <circular/4.pdf, id=121, 754.41847pt x 674.9225pt>
<./circular/3.pdf>] <circular/4.pdf, id=57, 754.41847pt x 674.9225pt>
File: circular/4.pdf Graphic file (type pdf)
<use circular/4.pdf>
Package pdftex.def Info: circular/4.pdf used on input line 67.
Package pdftex.def Info: circular/4.pdf used on input line 64.
(pdftex.def) Requested size: 250.93842pt x 224.49644pt.
[4
<./circular/4.pdf>]
<circular/5.pdf, id=154, 477.77196pt x 498.44118pt>
<circular/5.pdf, id=69, 477.77196pt x 498.44118pt>
File: circular/5.pdf Graphic file (type pdf)
<use circular/5.pdf>
Package pdftex.def Info: circular/5.pdf used on input line 81.
Package pdftex.def Info: circular/5.pdf used on input line 77.
(pdftex.def) Requested size: 210.78827pt x 219.90802pt.
[5
<./circular/5.pdf>] <circular/6.pdf, id=185, 706.7213pt x 674.9225pt>
<./circular/5.pdf>] <circular/6.pdf, id=81, 706.7213pt x 674.9225pt>
File: circular/6.pdf Graphic file (type pdf)
<use circular/6.pdf>
Package pdftex.def Info: circular/6.pdf used on input line 95.
Package pdftex.def Info: circular/6.pdf used on input line 90.
(pdftex.def) Requested size: 220.8258pt x 210.88185pt.
[6
<./circular/6.pdf>]
<mesh/1.pdf, id=216, 477.77196pt x 899.10202pt>
<mesh/1.pdf, id=93, 477.77196pt x 899.10202pt>
File: mesh/1.pdf Graphic file (type pdf)
<use mesh/1.pdf>
Package pdftex.def Info: mesh/1.pdf used on input line 114.
Package pdftex.def Info: mesh/1.pdf used on input line 107.
(pdftex.def) Requested size: 120.45044pt x 226.6682pt.
[7
<./mesh/1.pdf>] <mesh/2.pdf, id=250, 477.785pt x 518.73799pt>
Overfull \vbox (0.79634pt too high) detected at line 107
[]
[7
<./mesh/1.pdf>] <mesh/2.pdf, id=106, 477.785pt x 518.73799pt>
File: mesh/2.pdf Graphic file (type pdf)
<use mesh/2.pdf>
Package pdftex.def Info: mesh/2.pdf used on input line 127.
<use mesh/2.pdf>
Package pdftex.def Info: mesh/2.pdf used on input line 119.
(pdftex.def) Requested size: 190.7132pt x 207.05617pt.
[8
<./mesh/2.pdf>] <mesh/3.pdf, id=278, 700.21597pt x 675.32298pt>
<./mesh/2.pdf>]
<mesh/3.pdf, id=114, 700.21597pt x 675.32298pt>
File: mesh/3.pdf Graphic file (type pdf)
<use mesh/3.pdf>
Package pdftex.def Info: mesh/3.pdf used on input line 141.
Package pdftex.def Info: mesh/3.pdf used on input line 131.
(pdftex.def) Requested size: 220.0pt x 212.18172pt.
[9
[9
<./mesh/3.pdf>] <mesh/4.pdf, id=306, 857.60402pt x 675.32298pt>
<./mesh/3.pdf>] <mesh/4.pdf, id=122, 857.60402pt x 675.32298pt>
File: mesh/4.pdf Graphic file (type pdf)
<use mesh/4.pdf>
Package pdftex.def Info: mesh/4.pdf used on input line 155.
<use mesh/4.pdf>
Package pdftex.def Info: mesh/4.pdf used on input line 143.
(pdftex.def) Requested size: 250.93842pt x 197.60072pt.
[10
<./mesh/4.pdf>]
<mesh/5.pdf, id=334, 784.53098pt x 675.32298pt>
<./mesh/4.pdf>] <mesh/5.pdf, id=130, 784.53098pt x 675.32298pt>
File: mesh/5.pdf Graphic file (type pdf)
<use mesh/5.pdf>
Package pdftex.def Info: mesh/5.pdf used on input line 169.
Package pdftex.def Info: mesh/5.pdf used on input line 155.
(pdftex.def) Requested size: 250.93842pt x 216.00471pt.
[11
<./mesh/5.pdf>] <mesh/6.pdf, id=362, 477.785pt x 703.428pt>
[11
<./mesh/5.pdf>] <mesh/6.pdf, id=138, 477.785pt x 703.428pt>
File: mesh/6.pdf Graphic file (type pdf)
<use mesh/6.pdf>
Package pdftex.def Info: mesh/6.pdf used on input line 183.
<use mesh/6.pdf>
Package pdftex.def Info: mesh/6.pdf used on input line 167.
(pdftex.def) Requested size: 140.52551pt x 206.88692pt.
[12
<./mesh/6.pdf>]
Overfull \hbox (18.12257pt too wide) in paragraph at lines 195--195
[][]
[]
[13
]
\tf@nav=\write6
\openout6 = `slides.nav'.
@ -1204,30 +1224,30 @@ Package pdftex.def Info: mesh/6.pdf used on input line 183.
\tf@snm=\write8
\openout8 = `slides.snm'.
Package atveryend Info: Empty hook `BeforeClearDocument' on input line 185.
Package atveryend Info: Empty hook `AfterLastShipout' on input line 185.
Package atveryend Info: Empty hook `BeforeClearDocument' on input line 199.
Package atveryend Info: Empty hook `AfterLastShipout' on input line 199.
(./slides.aux)
Package atveryend Info: Executing hook `AtVeryEndDocument' on input line 185.
Package atveryend Info: Executing hook `AtEndAfterFileList' on input line 185.
Package atveryend Info: Executing hook `AtVeryEndDocument' on input line 199.
Package atveryend Info: Executing hook `AtEndAfterFileList' on input line 199.
Package rerunfilecheck Info: File `slides.out' has not changed.
(rerunfilecheck) Checksum: 41F24E60695CC0BC5029F1F76C6DB87C;90.
Package atveryend Info: Empty hook `AtVeryVeryEnd' on input line 185.
Package atveryend Info: Empty hook `AtVeryVeryEnd' on input line 199.
)
Here is how much of TeX's memory you used:
15889 strings out of 493633
290631 string characters out of 3143378
365168 words of memory out of 3000000
18786 multiletter control sequences out of 15000+200000
6559 words of font info for 19 fonts, out of 3000000 for 9000
15914 strings out of 493633
290738 string characters out of 3143378
386168 words of memory out of 3000000
18792 multiletter control sequences out of 15000+200000
11491 words of font info for 32 fonts, out of 3000000 for 9000
831 hyphenation exceptions out of 8191
49i,14n,55p,395b,555s stack positions out of 5000i,500n,10000p,200000b,50000s
49i,11n,55p,395b,386s stack positions out of 5000i,500n,10000p,200000b,50000s
{/usr/local/texlive/2011/texmf-dist/fonts/enc/dvips/cm-super/cm-super-t1.enc}
</usr/local/texlive/2011/texmf-dist/fonts/type1/public/cm-super/sfss0600.pfb></
usr/local/texlive/2011/texmf-dist/fonts/type1/public/cm-super/sfss1440.pfb>
Output written on slides.pdf (12 pages, 451598 bytes).
Output written on slides.pdf (13 pages, 444531 bytes).
PDF statistics:
407 PDF objects out of 1000 (max. 8388607)
357 compressed objects within 4 object streams
26 named destinations out of 1000 (max. 500000)
171 PDF objects out of 1000 (max. 8388607)
122 compressed objects within 2 object streams
28 named destinations out of 1000 (max. 500000)
109 words of extra memory for PDF output out of 10000 (max. 10000000)

View File

@ -29,8 +29,10 @@
\headcommand {\beamer@framepages {11}{11}}
\headcommand {\slideentry {2}{0}{12}{12/12}{}{0}}
\headcommand {\beamer@framepages {12}{12}}
\headcommand {\beamer@partpages {1}{12}}
\headcommand {\beamer@subsectionpages {7}{12}}
\headcommand {\beamer@sectionpages {7}{12}}
\headcommand {\beamer@documentpages {12}}
\headcommand {\def \inserttotalframenumber {12}}
\headcommand {\slideentry {2}{0}{13}{13/13}{}{0}}
\headcommand {\beamer@framepages {13}{13}}
\headcommand {\beamer@partpages {1}{13}}
\headcommand {\beamer@subsectionpages {7}{13}}
\headcommand {\beamer@sectionpages {7}{13}}
\headcommand {\beamer@documentpages {13}}
\headcommand {\def \inserttotalframenumber {13}}

View File

@ -165,4 +165,35 @@
\end{tabular}
\end{tiny}
\end{frame}
\begin{frame}{Zusammenfassung}
\begin{tiny}
\begin{tabular}{|l|l|l|l|l|l|l|}
\hline Szenario & Operation & Avg. Degree & Max. Degree & Diameter & Radius & Avg. Path Length \\
\hline 1 (circular) & 100 Nodes & 1,98 & 7 & 15 & 8 & 6,33 \\
\hline 1 (circular) & +100 Nodes & 1,99 & 9 & 18 & 9 & 7,25 \\
\hline 1 (circular) & -50 Nodes & 2,1 & 10 & 15 & 8 & 6,29\\
\hline 1 (circular) & +100 Nodes & 2,07 & 10 & 15 & 8 & 7,2\\
\hline 1 (circular) & -50 Nodes & 2,18 & 10 & 15 & 8 & 7,2\\
\hline 1 (circular) & -50 Nodes & 2,33 & 11 & 12 & 6 & 5,73\\ \hline
\hline 2 (mesh) & 100 Nodes & 1,98 & 7 & 13 & 7 & 5,95\\
\hline 2 (mesh) & +100 Nodes & 1,99 & 8 & 14 & 7 & 6,98\\
\hline 2 (mesh) & -50 Nodes & 2,37 & 10 & 11 & 6 & 5,99\\
\hline 2 (mesh) & +100 Nodes & 2,24 & 12 & 14 & 7 & 6,97\\
\hline 2 (mesh) & -50 Nodes & 3,18 & 24 & 13 & 7 & 5,50\\
\hline 2 (mesh) & -50 Nodes & 9,11 & 45 & 9 & 5 & 3,50\\ \hline
\hline 3 (circular) & 100 Nodes & 1,98 & 7 & 16 & 8 & 6,95 \\
\hline 3 (circular) & +100 Nodes & 1,90 & 9 & 20 & 10 & 8,14 \\
\hline 3 (circular) & -50 Nodes & 1,99 & 9 & 20 & 10 & 8,14 \\
\hline 3 (circular) & +100 Nodes & 1,99 & 9 & 21 & 11 & 9,26 \\
\hline 3 (circular) & -50 Nodes & 1,99 & 9 & 21 & 11 & 9,26 \\
\hline 3 (circular) & -50 Nodes & 1,99 & 9 & 21 & 11 & 9,26\\
\hline
\end{tabular}
\end{tiny}
\end{frame}
\end{document}