pseudocode is mooi

diff --git a/thesis2/5.appendices.tex b/thesis2/5.appendices.tex
index a3461f0..9e2a611 100644 (file)
--- a/thesis2/5.appendices.tex
+++ b/thesis2/5.appendices.tex
@@ -1,36 +1,36 @@
 \section{Algorithm}
-\begin{listing}
-       \label{pseudodawg}
-       \caption{Graph minimization algorithm}
-       \begin{minted}[mathescape=true,linenos=true]{text}
-register:=$\emptyset$
-while there is another word
-       word = next word
-       commonprefix = CommonPrefix(word)
-       laststate = delta_star(q0, commonprefix)
-       currentsuffix = word[length(commonprefix)..length(word)]
-       if has_children(laststate)
-       then
-               replace_or_register(last_state)
-       endif
-       add_suffix(laststate, currentsuffix)
-endwhile
-replace_or_register(q0)
+\begin{algorithm}[H]
+%      \KwData{this text}
+%      \KwResult{how to write algorithm with \LaTeX2e }
+       \SetKwProg{Def}{def}{:}{}
+       register := $\emptyset$\;
+       \While{there is another word}{%
+               word := next word\;
+               commonprefix := CommonPrefix(word)\;
+               laststate := delta\textsuperscript{*}(q0, commonprefix)\;
+               currentsuffix := word[length(commonprefix)\ldots length(word)]\;
+               \If{has\_children(laststate)}{%
+                       replace\_or\_register(laststate)\;
+               }
+               add\_suffix(laststate, currentsuffix)\;
+       }
+       replace\_or\_register(q0)\;
+       
 
-function replace_or_register(state)
-       child = last_child(state)
-       if has_children(child)
-               replace_or_register(child)
-       fi
-       if there is an equivalent state q
-               last_child(state = q
-               delete(child)
-       else
-               register.add(child)
-       endif
-endfunction
-       \end{minted}
-\end{listing}
+       \Def{replace\_or\_register\_dawg(state)}{%
+               child := last\_child(state)\;
+               \If{has\_children(child)}{%
+                       replace\_or\_register(child)\;
+               }
+               \eIf{there is an equivalent state q}{%
+                       last\_child(state)\;
+                       delete(child)\;
+               }{%
+                       register.add(child)\;
+               }
+       }
+       \caption{Generating DAWGs pseudocode}
+\end{algorithm}
 
 \section{Schemes}
 \subsection{scheme.xsd}

diff --git a/thesis2/appoverview.eps b/thesis2/appoverview.eps
index 2149cdc..c6f30bb 100644 (file)
--- a/thesis2/appoverview.eps
+++ b/thesis2/appoverview.eps
@@ -2,7 +2,7 @@
 %%Creator: graphviz version 2.38.0 (20140413.2041)
 %%Title: %3
 %%Pages: 1
-%%BoundingBox: 36 36 642 153
+%%BoundingBox: 36 36 766 153
 %%EndComments
 save
 %%BeginProlog
@@ -179,211 +179,211 @@ def
 %%EndSetup
 setupLatin1
 %%Page: 1 1
-%%PageBoundingBox: 36 36 642 153
+%%PageBoundingBox: 36 36 766 153
 %%PageOrientation: Portrait
 0 0 1 beginpage
 gsave
-36 36 606 117 boxprim clip newpath
+36 36 730 117 boxprim clip newpath
 1 1 set_scale 0 rotate 40 40 translate
 % User
 gsave
 1 setlinewidth
 0 0 0 nodecolor
-27.3 91 27.1 18 ellipse_path stroke
+32.5 91 32.49 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-14.3 87.3 moveto 26 (User) alignedtext
+15.5 87.3 moveto 34 (User) alignedtext
 grestore
 % Frontend
 gsave
 1 setlinewidth
 0 0 0 nodecolor
-132.3 91 42.49 18 ellipse_path stroke
+154.5 91 53.89 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-107.8 87.3 moveto 49 (Frontend) alignedtext
+121 87.3 moveto 67 (Frontend) alignedtext
 grestore
 % User->Frontend
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 54.78 91 moveto
-63.1 91 71.43 91 79.75 91 curveto
+newpath 65.38 91 moveto
+73.71 91 82.04 91 90.38 91 curveto
 stroke
 0 0 0 edgecolor
-newpath 79.9 94.5 moveto
-89.9 91 lineto
-79.9 87.5 lineto
+newpath 90.54 94.5 moveto
+100.54 91 lineto
+90.54 87.5 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 79.9 94.5 moveto
-89.9 91 lineto
-79.9 87.5 lineto
+newpath 90.54 94.5 moveto
+100.54 91 lineto
+90.54 87.5 lineto
 closepath stroke
 grestore
 % Backend
 gsave
 1 setlinewidth
 0 0 0 nodecolor
-251.3 91 41.69 18 ellipse_path stroke
+295.5 91 51.19 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-227.3 87.3 moveto 48 (Backend) alignedtext
+264 87.3 moveto 63 (Backend) alignedtext
 grestore
 % Frontend->Backend
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 174.6 91 moveto
-182.91 91 191.21 91 199.52 91 curveto
+newpath 208.47 91 moveto
+216.85 91 225.23 91 233.61 91 curveto
 stroke
 0 0 0 edgecolor
-newpath 199.65 94.5 moveto
-209.65 91 lineto
-199.65 87.5 lineto
+newpath 233.83 94.5 moveto
+243.83 91 lineto
+233.83 87.5 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 199.65 94.5 moveto
-209.65 91 lineto
-199.65 87.5 lineto
+newpath 233.83 94.5 moveto
+243.83 91 lineto
+233.83 87.5 lineto
 closepath stroke
 grestore
 % Crawler
 gsave
 1 setlinewidth
 0 0 0 nodecolor
-425.3 91 38.99 18 ellipse_path stroke
+512.5 91 48.19 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-403.3 87.3 moveto 44 (Crawler) alignedtext
+483.5 87.3 moveto 58 (Crawler) alignedtext
 grestore
 % Backend->Crawler
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 292.97 91 moveto
-317.92 91 349.75 91 375.95 91 curveto
+newpath 346.92 91 moveto
+379.07 91 420.55 91 453.96 91 curveto
 stroke
 0 0 0 edgecolor
-newpath 376.05 94.5 moveto
-386.05 91 lineto
-376.05 87.5 lineto
+newpath 454.05 94.5 moveto
+464.04 91 lineto
+454.04 87.5 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 376.05 94.5 moveto
-386.05 91 lineto
-376.05 87.5 lineto
+newpath 454.05 94.5 moveto
+464.04 91 lineto
+454.04 87.5 lineto
 closepath stroke
 0 0 0 edgecolor
 14 /Times-Roman set_font
-301.6 97.8 moveto 76 (Crawler spec.) alignedtext
+355.62 97.8 moveto 100 (Crawler spec.) alignedtext
 grestore
 % Database
 gsave
 1 setlinewidth
 0 0 0 nodecolor
-555.3 91 42.79 18 ellipse_path stroke
+668.5 91 53.89 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-530.3 87.3 moveto 50 (Database) alignedtext
+635 87.3 moveto 67 (Database) alignedtext
 grestore
 % Crawler->Database
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 464.3 91 moveto
-476.22 91 489.54 91 502.23 91 curveto
+newpath 561 91 moveto
+574.6 91 589.61 91 603.99 91 curveto
 stroke
 0 0 0 edgecolor
-newpath 502.23 94.5 moveto
-512.23 91 lineto
-502.23 87.5 lineto
+newpath 604.31 94.5 moveto
+614.31 91 lineto
+604.31 87.5 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 502.23 94.5 moveto
-512.23 91 lineto
-502.23 87.5 lineto
+newpath 604.31 94.5 moveto
+614.31 91 lineto
+604.31 87.5 lineto
 closepath stroke
 0 0 0 edgecolor
 14 /Times-Roman set_font
-472.85 97.8 moveto 31 (XML) alignedtext
+569.57 97.8 moveto 36 (XML) alignedtext
 grestore
 % Source
 gsave
 1 setlinewidth
 0 0 0 nodecolor
-425.3 18 35.19 18 ellipse_path stroke
+512.5 18 42.79 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-406.3 14.3 moveto 38 (Source) alignedtext
+487.5 14.3 moveto 50 (Source) alignedtext
 grestore
 % Crawler->Source
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 419.46 73.17 moveto
-418.6 65.16 418.35 55.36 418.71 46.32 curveto
+newpath 506.62 72.81 moveto
+505.78 64.79 505.55 55.05 505.92 46.07 curveto
 stroke
 0 0 0 edgecolor
-newpath 422.21 46.42 moveto
-419.42 36.2 lineto
-415.23 45.93 lineto
+newpath 509.41 46.25 moveto
+506.64 36.03 lineto
+502.43 45.75 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 422.21 46.42 moveto
-419.42 36.2 lineto
-415.23 45.93 lineto
+newpath 509.41 46.25 moveto
+506.64 36.03 lineto
+502.43 45.75 lineto
 closepath stroke
 grestore
 % Source->Frontend
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 393.97 26.42 moveto
-350.48 36.74 269.36 56.08 200.3 73 curveto
-192.98 74.79 185.23 76.71 177.68 78.59 curveto
+newpath 473.92 26.34 moveto
+420.37 36.57 320.5 55.8 235.5 73 curveto
+226.8 74.76 217.58 76.66 208.61 78.53 curveto
 stroke
 0 0 0 edgecolor
-newpath 176.78 75.21 moveto
-167.93 81.03 lineto
-178.48 82 lineto
+newpath 207.69 75.15 moveto
+198.61 80.62 lineto
+209.12 82 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 176.78 75.21 moveto
-167.93 81.03 lineto
-178.48 82 lineto
+newpath 207.69 75.15 moveto
+198.61 80.62 lineto
+209.12 82 lineto
 closepath stroke
 grestore
 % Source->Crawler
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 431.18 36.2 moveto
-432.02 44.27 432.25 54.08 431.87 63.1 curveto
+newpath 518.36 36.03 moveto
+519.21 44.03 519.45 53.77 519.08 62.75 curveto
 stroke
 0 0 0 edgecolor
-newpath 428.37 62.95 moveto
-431.14 73.17 lineto
-435.35 63.45 lineto
+newpath 515.59 62.59 moveto
+518.38 72.81 lineto
+522.57 63.08 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 428.37 62.95 moveto
-431.14 73.17 lineto
-435.35 63.45 lineto
+newpath 515.59 62.59 moveto
+518.38 72.81 lineto
+522.57 63.08 lineto
 closepath stroke
 grestore
 endpage

diff --git a/thesis2/backend.eps b/thesis2/backend.eps
index 5b6bd39..13d73c8 100644 (file)
--- a/thesis2/backend.eps
+++ b/thesis2/backend.eps
@@ -2,7 +2,7 @@
 %%Creator: graphviz version 2.38.0 (20140413.2041)
 %%Title: %3
 %%Pages: 1
-%%BoundingBox: 36 36 1045 152
+%%BoundingBox: 36 36 1215 152
 %%EndComments
 save
 %%BeginProlog
@@ -179,232 +179,232 @@ def
 %%EndSetup
 setupLatin1
 %%Page: 1 1
-%%PageBoundingBox: 36 36 1045 152
+%%PageBoundingBox: 36 36 1215 152
 %%PageOrientation: Portrait
 0 0 1 beginpage
 gsave
-36 36 1009 116 boxprim clip newpath
+36 36 1179 116 boxprim clip newpath
 1 1 set_scale 0 rotate 40 40 translate
 % q0
 % HTML data
 gsave
 1 setlinewidth
 0 0 0 nodecolor
-223.3 18 53.09 18 ellipse_path stroke
+259.34 18 64.19 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-190.3 14.3 moveto 66 (HTML data) alignedtext
+217.84 14.3 moveto 83 (HTML data) alignedtext
 grestore
 % q0->HTML data
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 54.2 18 moveto
-81.07 18 123.86 18 159.54 18 curveto
+newpath 54.42 18 moveto
+86 18 140.15 18 184.72 18 curveto
 stroke
 0 0 0 edgecolor
-newpath 159.88 21.5 moveto
-169.88 18 lineto
-159.88 14.5 lineto
+newpath 184.94 21.5 moveto
+194.94 18 lineto
+184.94 14.5 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 159.88 21.5 moveto
-169.88 18 lineto
-159.88 14.5 lineto
+newpath 184.94 21.5 moveto
+194.94 18 lineto
+184.94 14.5 lineto
 closepath stroke
 0 0 0 edgecolor
 14 /Times-Roman set_font
-72 21.8 moveto 80 (From frontend) alignedtext
+72 21.8 moveto 105 (From frontend) alignedtext
 grestore
 % q1
 % Table rows
 gsave
 1 setlinewidth
 0 0 0 nodecolor
-363.64 47 50.09 18 ellipse_path stroke
+421.78 47 61.19 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-333.14 43.3 moveto 61 (Table rows) alignedtext
+382.78 43.3 moveto 78 (Table rows) alignedtext
 grestore
 % HTML data->Table rows
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 269.21 27.42 moveto
-282.16 30.13 296.41 33.12 309.8 35.92 curveto
+newpath 313.77 27.66 moveto
+328.28 30.28 344.12 33.14 359.06 35.84 curveto
 stroke
 0 0 0 edgecolor
-newpath 309.32 39.4 moveto
-319.83 38.03 lineto
-310.76 32.55 lineto
+newpath 358.76 39.35 moveto
+369.23 37.68 lineto
+360.01 32.46 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 309.32 39.4 moveto
-319.83 38.03 lineto
-310.76 32.55 lineto
+newpath 358.76 39.35 moveto
+369.23 37.68 lineto
+360.01 32.46 lineto
 closepath stroke
 grestore
 % Dictionary
 gsave
 1 setlinewidth
 0 0 0 nodecolor
-802.47 44 48.19 18 ellipse_path stroke
+944.77 44 59.59 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-773.47 40.3 moveto 58 (Dictionary) alignedtext
+906.77 40.3 moveto 76 (Dictionary) alignedtext
 grestore
 % HTML data->Dictionary
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 270.55 9.45 moveto
-297.35 5.22 331.78 1 362.64 1 curveto
-362.64 1 362.64 1 686.53 1 curveto
-715.05 1 745.18 12.76 767.43 23.98 curveto
+newpath 315.88 9.2 moveto
+346.7 5.05 385.77 1 420.78 1 curveto
+420.78 1 420.78 1 811.92 1 curveto
+844.37 1 879.2 12.92 904.91 24.21 curveto
 stroke
 0 0 0 edgecolor
-newpath 765.97 27.17 moveto
-776.45 28.72 lineto
-769.23 20.97 lineto
+newpath 903.74 27.52 moveto
+914.29 28.48 lineto
+906.63 21.15 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 765.97 27.17 moveto
-776.45 28.72 lineto
-769.23 20.97 lineto
+newpath 903.74 27.52 moveto
+914.29 28.48 lineto
+906.63 21.15 lineto
 closepath stroke
 0 0 0 edgecolor
 14 /Times-Roman set_font
-450.68 4.8 moveto 97 (Description fields) alignedtext
+519.88 4.8 moveto 127 (Description fields) alignedtext
 grestore
 % Node lists
 gsave
 1 setlinewidth
 0 0 0 nodecolor
-499.18 90 46.29 18 ellipse_path stroke
+583.38 90 57.69 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-471.68 86.3 moveto 55 (Node lists) alignedtext
+546.88 86.3 moveto 73 (Node lists) alignedtext
 grestore
 % Table rows->Node lists
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 401.48 58.86 moveto
-417.49 64.02 436.38 70.1 453.21 75.52 curveto
+newpath 467.66 59.09 moveto
+486.83 64.26 509.34 70.32 529.32 75.71 curveto
 stroke
 0 0 0 edgecolor
-newpath 452.25 78.89 moveto
-462.84 78.62 lineto
-454.39 72.22 lineto
+newpath 528.64 79.15 moveto
+539.21 78.37 lineto
+530.46 72.39 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 452.25 78.89 moveto
-462.84 78.62 lineto
-454.39 72.22 lineto
+newpath 528.64 79.15 moveto
+539.21 78.37 lineto
+530.46 72.39 lineto
 closepath stroke
 grestore
 % Table rows->Dictionary
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 413.9 46.66 moveto
-495.38 46.1 657.77 44.99 744.22 44.39 curveto
+newpath 483.06 46.65 moveto
+580.42 46.09 771.77 44.99 874.56 44.4 curveto
 stroke
 0 0 0 edgecolor
-newpath 744.4 47.89 moveto
-754.38 44.32 lineto
-744.36 40.89 lineto
+newpath 874.85 47.9 moveto
+884.83 44.34 lineto
+874.81 40.9 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 744.4 47.89 moveto
-754.38 44.32 lineto
-744.36 40.89 lineto
+newpath 874.85 47.9 moveto
+884.83 44.34 lineto
+874.81 40.9 lineto
 closepath stroke
 0 0 0 edgecolor
 14 /Times-Roman set_font
-565.68 48.8 moveto 70 (Original text) alignedtext
+664.88 48.8 moveto 91 (Original text) alignedtext
 grestore
 % Dawg
 gsave
 1 setlinewidth
 0 0 0 nodecolor
-685.53 90 31.7 18 ellipse_path stroke
+810.92 90 37.09 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-669.03 86.3 moveto 33 (Dawg) alignedtext
+790.42 86.3 moveto 41 (Dawg) alignedtext
 grestore
 % Node lists->Dawg
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 545.75 90 moveto
-575.66 90 614.46 90 643.43 90 curveto
+newpath 641.29 90 moveto
+679.18 90 728.33 90 763.78 90 curveto
 stroke
 0 0 0 edgecolor
-newpath 643.62 93.5 moveto
-653.62 90 lineto
-643.62 86.5 lineto
+newpath 763.85 93.5 moveto
+773.85 90 lineto
+763.85 86.5 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 643.62 93.5 moveto
-653.62 90 lineto
-643.62 86.5 lineto
+newpath 763.85 93.5 moveto
+773.85 90 lineto
+763.85 86.5 lineto
 closepath stroke
 grestore
 % Dawg->Dictionary
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 712.04 79.79 moveto
-725.95 74.22 743.53 67.19 759.41 60.83 curveto
+newpath 841.51 79.68 moveto
+857.27 74.18 877.06 67.27 895.02 61.01 curveto
 stroke
 0 0 0 edgecolor
-newpath 761.04 63.95 moveto
-769.03 56.98 lineto
-758.44 57.45 lineto
+newpath 896.48 64.21 moveto
+904.77 57.61 lineto
+894.17 57.6 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 761.04 63.95 moveto
-769.03 56.98 lineto
-758.44 57.45 lineto
+newpath 896.48 64.21 moveto
+904.77 57.61 lineto
+894.17 57.6 lineto
 closepath stroke
 grestore
 % Dictionary->q1
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 850.57 44 moveto
-877.59 44 911.01 44 936.03 44 curveto
+newpath 1004.81 44 moveto
+1037.74 44 1077.71 44 1106.09 44 curveto
 stroke
 0 0 0 edgecolor
-newpath 936.2 47.5 moveto
-946.2 44 lineto
-936.2 40.5 lineto
+newpath 1106.36 47.5 moveto
+1116.36 44 lineto
+1106.36 40.5 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 936.2 47.5 moveto
-946.2 44 lineto
-936.2 40.5 lineto
+newpath 1106.36 47.5 moveto
+1116.36 44 lineto
+1106.36 40.5 lineto
 closepath stroke
 0 0 0 edgecolor
 14 /Times-Roman set_font
-868.57 47.8 moveto 60 (To crawler) alignedtext
+1022.56 47.8 moveto 76 (To crawler) alignedtext
 grestore
 endpage
 showpage

diff --git a/thesis2/nddawg.eps b/thesis2/nddawg.eps
index 75fd55b..0600bb2 100644 (file)
--- a/thesis2/nddawg.eps
+++ b/thesis2/nddawg.eps
@@ -2,7 +2,7 @@
 %%Creator: graphviz version 2.38.0 (20140413.2041)
 %%Title: %3
 %%Pages: 1
-%%BoundingBox: 36 36 604 134
+%%BoundingBox: 36 36 634 134
 %%EndComments
 save
 %%BeginProlog
@@ -179,11 +179,11 @@ def
 %%EndSetup
 setupLatin1
 %%Page: 1 1
-%%PageBoundingBox: 36 36 604 134
+%%PageBoundingBox: 36 36 634 134
 %%PageOrientation: Portrait
 0 0 1 beginpage
 gsave
-36 36 568 98 boxprim clip newpath
+36 36 598 98 boxprim clip newpath
 1 1 set_scale 0 rotate 40 40 translate
 % n0
 % q0
@@ -193,7 +193,7 @@ gsave
 118 47 27 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-111 43.3 moveto 14 (q0) alignedtext
+108.5 43.3 moveto 19 (q0) alignedtext
 grestore
 % n0->q0
 gsave
@@ -219,219 +219,219 @@ grestore
 gsave
 1 setlinewidth
 0 0 0 nodecolor
-536.5 47 19.5 19.5 ellipse_path stroke
+563.75 47 22.96 22.96 ellipse_path stroke
 1 setlinewidth
 0 0 0 nodecolor
-536.5 47 23.5 23.5 ellipse_path stroke
+563.75 47 27 27 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-529.5 43.3 moveto 14 (q4) alignedtext
+554.25 43.3 moveto 19 (q4) alignedtext
 grestore
 % q1
 gsave
 1 setlinewidth
 0 0 0 nodecolor
-215 47 27 18 ellipse_path stroke
+217 47 27 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-208 43.3 moveto 14 (q1) alignedtext
+207.5 43.3 moveto 19 (q1) alignedtext
 grestore
 % q0->q1
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 145.21 47 moveto
-155.28 47 166.96 47 177.81 47 curveto
+newpath 145.25 47 moveto
+155.82 47 168.18 47 179.6 47 curveto
 stroke
 0 0 0 edgecolor
-newpath 177.87 50.5 moveto
-187.87 47 lineto
-177.87 43.5 lineto
+newpath 179.73 50.5 moveto
+189.73 47 lineto
+179.73 43.5 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 177.87 50.5 moveto
-187.87 47 lineto
-177.87 43.5 lineto
+newpath 179.73 50.5 moveto
+189.73 47 lineto
+179.73 43.5 lineto
 closepath stroke
 0 0 0 edgecolor
 14 /Times-Roman set_font
-163 50.8 moveto 7 (a) alignedtext
+163 50.8 moveto 9 (a) alignedtext
 grestore
 % q2
 gsave
 1 setlinewidth
 0 0 0 nodecolor
-329 72 27 18 ellipse_path stroke
+341 72 27 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-322 68.3 moveto 14 (q2) alignedtext
+331.5 68.3 moveto 19 (q2) alignedtext
 grestore
 % q1->q2
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 240.86 52.55 moveto
-256.23 55.98 276.19 60.43 293.12 64.22 curveto
+newpath 242.98 52.12 moveto
+260.91 55.79 285.31 60.79 305.15 64.86 curveto
 stroke
 0 0 0 edgecolor
-newpath 292.69 67.7 moveto
-303.21 66.47 lineto
-294.22 60.87 lineto
+newpath 304.55 68.31 moveto
+315.05 66.89 lineto
+305.96 61.45 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 292.69 67.7 moveto
-303.21 66.47 lineto
-294.22 60.87 lineto
+newpath 304.55 68.31 moveto
+315.05 66.89 lineto
+305.96 61.45 lineto
 closepath stroke
 0 0 0 edgecolor
 14 /Times-Roman set_font
-268.5 64.8 moveto 7 (b) alignedtext
+274 65.8 moveto 10 (b) alignedtext
 grestore
 % q5
 gsave
 1 setlinewidth
 0 0 0 nodecolor
-329 18 27 18 ellipse_path stroke
+341 18 27 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-322 14.3 moveto 14 (q5) alignedtext
+331.5 14.3 moveto 19 (q5) alignedtext
 grestore
 % q1->q5
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 240.3 40.71 moveto
-255.9 36.67 276.39 31.36 293.64 26.9 curveto
+newpath 242.69 41.13 moveto
+260.71 36.85 285.39 30.98 305.38 26.23 curveto
 stroke
 0 0 0 edgecolor
-newpath 294.55 30.28 moveto
-303.36 24.38 lineto
-292.8 23.5 lineto
+newpath 306.43 29.58 moveto
+315.35 23.86 lineto
+304.81 22.77 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 294.55 30.28 moveto
-303.36 24.38 lineto
-292.8 23.5 lineto
+newpath 306.43 29.58 moveto
+315.35 23.86 lineto
+304.81 22.77 lineto
 closepath stroke
 0 0 0 edgecolor
 14 /Times-Roman set_font
-260 38.8 moveto 24 (<1>) alignedtext
+262 38.8 moveto 34 (<1>) alignedtext
 grestore
 % q3
 gsave
 1 setlinewidth
 0 0 0 nodecolor
-443 72 27 18 ellipse_path stroke
+465 72 27 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-436 68.3 moveto 14 (q3) alignedtext
+455.5 68.3 moveto 19 (q3) alignedtext
 grestore
 % q2->q3
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 356.26 72 moveto
-371 72 389.62 72 405.74 72 curveto
+newpath 368.17 72 moveto
+385.54 72 408.57 72 427.7 72 curveto
 stroke
 0 0 0 edgecolor
-newpath 405.91 75.5 moveto
-415.91 72 lineto
-405.91 68.5 lineto
+newpath 427.87 75.5 moveto
+437.87 72 lineto
+427.87 68.5 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 405.91 75.5 moveto
-415.91 72 lineto
-405.91 68.5 lineto
+newpath 427.87 75.5 moveto
+437.87 72 lineto
+427.87 68.5 lineto
 closepath stroke
 0 0 0 edgecolor
 14 /Times-Roman set_font
-374 75.8 moveto 24 (<1>) alignedtext
+386 75.8 moveto 34 (<1>) alignedtext
 grestore
 % q3->q4
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 468.52 65.3 moveto
-479.41 62.32 492.36 58.79 503.96 55.62 curveto
+newpath 490.41 65.69 moveto
+501.7 62.78 515.31 59.26 527.66 56.07 curveto
 stroke
 0 0 0 edgecolor
-newpath 505 58.96 moveto
-513.72 52.95 lineto
-503.15 52.21 lineto
+newpath 528.86 59.37 moveto
+537.67 53.48 lineto
+527.11 52.59 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 505 58.96 moveto
-513.72 52.95 lineto
-503.15 52.21 lineto
+newpath 528.86 59.37 moveto
+537.67 53.48 lineto
+527.11 52.59 lineto
 closepath stroke
 0 0 0 edgecolor
 14 /Times-Roman set_font
-488 62.8 moveto 7 (c) alignedtext
+510 63.8 moveto 9 (c) alignedtext
 grestore
 % q6
 gsave
 1 setlinewidth
 0 0 0 nodecolor
-443 18 27 18 ellipse_path stroke
+465 18 27 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-436 14.3 moveto 14 (q6) alignedtext
+455.5 14.3 moveto 19 (q6) alignedtext
 grestore
 % q5->q6
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 356.26 18 moveto
-371 18 389.62 18 405.74 18 curveto
+newpath 368.17 18 moveto
+385.54 18 408.57 18 427.7 18 curveto
 stroke
 0 0 0 edgecolor
-newpath 405.91 21.5 moveto
-415.91 18 lineto
-405.91 14.5 lineto
+newpath 427.87 21.5 moveto
+437.87 18 lineto
+427.87 14.5 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 405.91 21.5 moveto
-415.91 18 lineto
-405.91 14.5 lineto
+newpath 427.87 21.5 moveto
+437.87 18 lineto
+427.87 14.5 lineto
 closepath stroke
 0 0 0 edgecolor
 14 /Times-Roman set_font
-382.5 21.8 moveto 7 (b) alignedtext
+398 21.8 moveto 10 (b) alignedtext
 grestore
 % q6->q4
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 468.04 25.62 moveto
-479.02 29.1 492.16 33.26 503.92 36.99 curveto
+newpath 489.92 25.17 moveto
+501.4 28.61 515.37 32.8 527.99 36.58 curveto
 stroke
 0 0 0 edgecolor
-newpath 503.22 40.44 moveto
-513.81 40.13 lineto
-505.33 33.77 lineto
+newpath 527.17 39.99 moveto
+537.76 39.51 lineto
+529.18 33.29 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 503.22 40.44 moveto
-513.81 40.13 lineto
-505.33 33.77 lineto
+newpath 527.17 39.99 moveto
+537.76 39.51 lineto
+529.18 33.29 lineto
 closepath stroke
 0 0 0 edgecolor
 14 /Times-Roman set_font
-488 37.8 moveto 7 (c) alignedtext
+510 36.8 moveto 9 (c) alignedtext
 grestore
 endpage
 showpage

diff --git a/thesis2/nodelistexample.eps b/thesis2/nodelistexample.eps
index 150122a..8d1afde 100644 (file)
--- a/thesis2/nodelistexample.eps
+++ b/thesis2/nodelistexample.eps
@@ -2,7 +2,7 @@
 %%Creator: graphviz version 2.38.0 (20140413.2041)
 %%Title: %3
 %%Pages: 1
-%%BoundingBox: 36 36 1077 91
+%%BoundingBox: 36 36 1149 97
 %%EndComments
 save
 %%BeginProlog
@@ -179,300 +179,300 @@ def
 %%EndSetup
 setupLatin1
 %%Page: 1 1
-%%PageBoundingBox: 36 36 1077 91
+%%PageBoundingBox: 36 36 1149 97
 %%PageOrientation: Portrait
 0 0 1 beginpage
 gsave
-36 36 1041 55 boxprim clip newpath
+36 36 1113 61 boxprim clip newpath
 1 1 set_scale 0 rotate 40 40 translate
 % n0
 % n1
 gsave
 1 setlinewidth
 0 0 0 nodecolor
-118 23.5 27 18 ellipse_path stroke
+118 26.75 27 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-111 19.8 moveto 14 (n1) alignedtext
+108.5 23.05 moveto 19 (n1) alignedtext
 grestore
 % n0->n1
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 54.22 23.5 moveto
-62.55 23.5 71.91 23.5 80.82 23.5 curveto
+newpath 54.22 26.75 moveto
+62.55 26.75 71.91 26.75 80.82 26.75 curveto
 stroke
 0 0 0 edgecolor
-newpath 80.97 27 moveto
-90.97 23.5 lineto
-80.97 20 lineto
+newpath 80.97 30.25 moveto
+90.97 26.75 lineto
+80.97 23.25 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 80.97 27 moveto
-90.97 23.5 lineto
-80.97 20 lineto
+newpath 80.97 30.25 moveto
+90.97 26.75 lineto
+80.97 23.25 lineto
 closepath stroke
 grestore
 % n9
 gsave
 1 setlinewidth
 0 0 0 nodecolor
-1009.5 23.5 19.5 19.5 ellipse_path stroke
+1078.75 26.75 22.96 22.96 ellipse_path stroke
 1 setlinewidth
 0 0 0 nodecolor
-1009.5 23.5 23.5 23.5 ellipse_path stroke
+1078.75 26.75 27 27 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-1002.5 19.8 moveto 14 (n9) alignedtext
+1069.25 23.05 moveto 19 (n9) alignedtext
 grestore
 % n2
 gsave
 1 setlinewidth
 0 0 0 nodecolor
-250 23.5 27 18 ellipse_path stroke
+265 26.75 27 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-243 19.8 moveto 14 (n2) alignedtext
+255.5 23.05 moveto 19 (n2) alignedtext
 grestore
 % n1->n2
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 145.31 23.5 moveto
-164.69 23.5 191.29 23.5 212.7 23.5 curveto
+newpath 145.26 26.75 moveto
+168.36 26.75 202.2 26.75 227.85 26.75 curveto
 stroke
 0 0 0 edgecolor
-newpath 212.73 27 moveto
-222.73 23.5 lineto
-212.73 20 lineto
+newpath 227.94 30.25 moveto
+237.94 26.75 lineto
+227.94 23.25 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 212.73 27 moveto
-222.73 23.5 lineto
-212.73 20 lineto
+newpath 227.94 30.25 moveto
+237.94 26.75 lineto
+227.94 23.25 lineto
 closepath stroke
 0 0 0 edgecolor
 14 /Times-Roman set_font
-163 27.3 moveto 42 (<time>) alignedtext
+163 30.55 moveto 57 (<time>) alignedtext
 grestore
 % n3
 gsave
 1 setlinewidth
 0 0 0 nodecolor
-349 23.5 27 18 ellipse_path stroke
+368 26.75 27 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-342 19.8 moveto 14 (n3) alignedtext
+358.5 23.05 moveto 19 (n3) alignedtext
 grestore
 % n2->n3
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 277.25 23.5 moveto
-287.82 23.5 300.18 23.5 311.6 23.5 curveto
+newpath 292.01 26.75 moveto
+303.7 26.75 317.7 26.75 330.42 26.75 curveto
 stroke
 0 0 0 edgecolor
-newpath 311.73 27 moveto
-321.73 23.5 lineto
-311.73 20 lineto
+newpath 330.73 30.25 moveto
+340.73 26.75 lineto
+330.73 23.25 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 311.73 27 moveto
-321.73 23.5 lineto
-311.73 20 lineto
+newpath 330.73 30.25 moveto
+340.73 26.75 lineto
+330.73 23.25 lineto
 closepath stroke
 0 0 0 edgecolor
 14 /Times-Roman set_font
-295 27.3 moveto 9 (',') alignedtext
+310 30.55 moveto 13 (',') alignedtext
 grestore
 % n4
 gsave
 1 setlinewidth
 0 0 0 nodecolor
-451 23.5 27 18 ellipse_path stroke
+474 26.75 27 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-444 19.8 moveto 14 (n4) alignedtext
+464.5 23.05 moveto 19 (n4) alignedtext
 grestore
 % n3->n4
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 376.01 23.5 moveto
-387.5 23.5 401.19 23.5 413.66 23.5 curveto
+newpath 395.24 26.75 moveto
+407.81 26.75 423.05 26.75 436.71 26.75 curveto
 stroke
 0 0 0 edgecolor
-newpath 413.77 27 moveto
-423.77 23.5 lineto
-413.77 20 lineto
+newpath 436.76 30.25 moveto
+446.76 26.75 lineto
+436.76 23.25 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 413.77 27 moveto
-423.77 23.5 lineto
-413.77 20 lineto
+newpath 436.76 30.25 moveto
+446.76 26.75 lineto
+436.76 23.25 lineto
 closepath stroke
 0 0 0 edgecolor
 14 /Times-Roman set_font
-394 27.3 moveto 12 ('_') alignedtext
+413 30.55 moveto 16 ('_') alignedtext
 grestore
 % n5
 gsave
 1 setlinewidth
 0 0 0 nodecolor
-581 23.5 27 18 ellipse_path stroke
+620 26.75 27 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-574 19.8 moveto 14 (n5) alignedtext
+610.5 23.05 moveto 19 (n5) alignedtext
 grestore
 % n4->n5
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 478.21 23.5 moveto
-497.11 23.5 522.85 23.5 543.72 23.5 curveto
+newpath 501.08 26.75 moveto
+523.87 26.75 557.21 26.75 582.62 26.75 curveto
 stroke
 0 0 0 edgecolor
-newpath 543.82 27 moveto
-553.82 23.5 lineto
-543.82 20 lineto
+newpath 582.63 30.25 moveto
+592.63 26.75 lineto
+582.63 23.25 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 543.82 27 moveto
-553.82 23.5 lineto
-543.82 20 lineto
+newpath 582.63 30.25 moveto
+592.63 26.75 lineto
+582.63 23.25 lineto
 closepath stroke
 0 0 0 edgecolor
 14 /Times-Roman set_font
-496 27.3 moveto 40 (<date>) alignedtext
+519 30.55 moveto 56 (<date>) alignedtext
 grestore
 % n6
 gsave
 1 setlinewidth
 0 0 0 nodecolor
-683 23.5 27 18 ellipse_path stroke
+726 26.75 27 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-676 19.8 moveto 14 (n6) alignedtext
+716.5 23.05 moveto 19 (n6) alignedtext
 grestore
 % n5->n6
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 608.01 23.5 moveto
-619.5 23.5 633.19 23.5 645.66 23.5 curveto
+newpath 647.24 26.75 moveto
+659.81 26.75 675.05 26.75 688.71 26.75 curveto
 stroke
 0 0 0 edgecolor
-newpath 645.77 27 moveto
-655.77 23.5 lineto
-645.77 20 lineto
+newpath 688.76 30.25 moveto
+698.76 26.75 lineto
+688.76 23.25 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 645.77 27 moveto
-655.77 23.5 lineto
-645.77 20 lineto
+newpath 688.76 30.25 moveto
+698.76 26.75 lineto
+688.76 23.25 lineto
 closepath stroke
 0 0 0 edgecolor
 14 /Times-Roman set_font
-626 27.3 moveto 12 ('_') alignedtext
+665 30.55 moveto 16 ('_') alignedtext
 grestore
 % n7
 gsave
 1 setlinewidth
 0 0 0 nodecolor
-783 23.5 27 18 ellipse_path stroke
+829 26.75 27 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-776 19.8 moveto 14 (n7) alignedtext
+819.5 23.05 moveto 19 (n7) alignedtext
 grestore
 % n6->n7
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 710 23.5 moveto
-720.97 23.5 733.92 23.5 745.79 23.5 curveto
+newpath 753.01 26.75 moveto
+764.7 26.75 778.7 26.75 791.42 26.75 curveto
 stroke
 0 0 0 edgecolor
-newpath 745.87 27 moveto
-755.87 23.5 lineto
-745.87 20 lineto
+newpath 791.73 30.25 moveto
+801.73 26.75 lineto
+791.73 23.25 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 745.87 27 moveto
-755.87 23.5 lineto
-745.87 20 lineto
+newpath 791.73 30.25 moveto
+801.73 26.75 lineto
+791.73 23.25 lineto
 closepath stroke
 0 0 0 edgecolor
 14 /Times-Roman set_font
-728 27.3 moveto 10 ('-') alignedtext
+771 30.55 moveto 13 ('-') alignedtext
 grestore
 % n8
 gsave
 1 setlinewidth
 0 0 0 nodecolor
-885 23.5 27 18 ellipse_path stroke
+935 26.75 27 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-878 19.8 moveto 14 (n8) alignedtext
+925.5 23.05 moveto 19 (n8) alignedtext
 grestore
 % n7->n8
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 810.01 23.5 moveto
-821.5 23.5 835.19 23.5 847.66 23.5 curveto
+newpath 856.24 26.75 moveto
+868.81 26.75 884.05 26.75 897.71 26.75 curveto
 stroke
 0 0 0 edgecolor
-newpath 847.77 27 moveto
-857.77 23.5 lineto
-847.77 20 lineto
+newpath 897.76 30.25 moveto
+907.76 26.75 lineto
+897.76 23.25 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 847.77 27 moveto
-857.77 23.5 lineto
-847.77 20 lineto
+newpath 897.76 30.25 moveto
+907.76 26.75 lineto
+897.76 23.25 lineto
 closepath stroke
 0 0 0 edgecolor
 14 /Times-Roman set_font
-828 27.3 moveto 12 ('_') alignedtext
+874 30.55 moveto 16 ('_') alignedtext
 grestore
 % n8->n9
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 912.28 23.5 moveto
-930.87 23.5 955.93 23.5 975.81 23.5 curveto
+newpath 962.33 26.75 moveto
+984.61 26.75 1016.76 26.75 1041.47 26.75 curveto
 stroke
 0 0 0 edgecolor
-newpath 975.96 27 moveto
-985.96 23.5 lineto
-975.96 20 lineto
+newpath 1041.56 30.25 moveto
+1051.56 26.75 lineto
+1041.56 23.25 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 975.96 27 moveto
-985.96 23.5 lineto
-975.96 20 lineto
+newpath 1041.56 30.25 moveto
+1051.56 26.75 lineto
+1041.56 23.25 lineto
 closepath stroke
 0 0 0 edgecolor
 14 /Times-Roman set_font
-930 27.3 moveto 38 (<title>) alignedtext
+980 30.55 moveto 54 (<title>) alignedtext
 grestore
 endpage
 showpage

diff --git a/thesis2/thesis.tex b/thesis2/thesis.tex
index 6a9264c..6f94dde 100644 (file)
--- a/thesis2/thesis.tex
+++ b/thesis2/thesis.tex
@@ -2,6 +2,8 @@
 
 %\usepackage[british]{babel}
 
+\usepackage{algorithm2e}
+\usepackage{a4wide}
 \usepackage{courier}
 \usepackage{graphicx}
 \usepackage{float}