c

diff --git a/thesis2/3.methods.tex b/thesis2/3.methods.tex
index bd0bd4f..2bc95bb 100644 (file)
--- a/thesis2/3.methods.tex
+++ b/thesis2/3.methods.tex
@@ -25,9 +25,9 @@ done in Javascript on the user side, the processing of the data in the backend
 is all done server side.
 
 \section{Table rows}
-When the backend receives the HTTP POST data it saves all the table HTML data and the
-data from the description fields. The program first extracts the table rows
-using simple pattern matching on the added markers. The table rows are
+When the backend receives the HTTP POST data it saves all the table HTML data
+and the data from the description fields. The program first extracts the table
+rows using simple pattern matching on the added markers. The table rows are
 processed one at the time, the processing mainly consists of finding the
 \texttt{SPAN} elements, extract the color, remove the elements and save the
 plain text and the location and type of the marking. When the table rows are
@@ -37,14 +37,14 @@ will go to the next step. All intermediate data will be saved for later use.
 \section{Node lists}
 Every entry from the datastructure is processed to convert them to node-lists.
 A node-list can be seen as a path graph of every character and marking. A path
-graph $G$ is defined as $G=(V,n_1,E,n_i)$ where $V=\{n_1, n_2, \cdots, n_{i-1}, n_i\}$
-and $E=\{(n_1, n_2), (n_2, n_3), ... (n_{i-1}, n_{i})\}$. A path graph is
-basically a graph that is a path of nodes where every node is connected to the
-next on and the last on being final. The transitions between two nodes is
-either a character or a marking. As an example we take the entry
-\texttt{19:00, 2014-11-12 - Foobar} and create the corresponding node-lists and
-make it visible in Figure~\ref{nodelistexample}. Characters are denoted with
-single quotes, spaces with an underscore and markers with angle brackets.
+graph $G$ is defined as $G=(V,n_1,E,n_i)$ where $V=\{n_1, n_2, \cdots, n_{i-1},
+n_i\}$ and $E=\{(n_1, n_2), (n_2, n_3), ... (n_{i-1}, n_{i})\}$. A path graph
+is basically a graph that is a path of nodes where every node is connected to
+the next on and the last on being final. The transitions between two nodes is
+either a character or a marking. As an example we take the entry \texttt{19:00,
+2014-11-12 - Foobar} and create the corresponding node-lists and make it
+visible in Figure~\ref{nodelistexample}. Characters are denoted with single
+quotes, spaces with an underscore and markers with angle brackets.
 \begin{figure}[H]
        \label{nodelistexample}
        \centering
@@ -172,14 +172,14 @@ added.
                q31 [label="q1"];
                q32 [label="q2"];
                q33 [label="q3"];
-               q34 [label="q4"ishape=doublecircle];
+               q34 [label="q4" shape=doublecircle];
                q35 [label="q5"];
                n3 -> q30[label="SG3"];
                q30 -> q31[label="a"];
                q31 -> q32[label="b"];
                q32 -> q33[label="c"];
                q33 -> q34[label="d"];
-               q33 -> q34[label="f"iconstraint=false];
+               q33 -> q34[label="f" constraint=false];
                q31 -> q35[label="e"];
                q35 -> q33[label="c"];
 
@@ -188,7 +188,7 @@ added.
                q21 [label="q1"];
                q22 [label="q2"];
                q23 [label="q3"];
-               q24 [label="q4"ishape=doublecircle];
+               q24 [label="q4" shape=doublecircle];
                q25 [label="q5"];
                n2 -> q20[label="SG2"];
                q20 -> q21[label="a"];
@@ -203,7 +203,7 @@ added.
                q11 [label="q1"];
                q12 [label="q2"];
                q13 [label="q3"];
-               q14 [label="q4"ishape=doublecircle];
+               q14 [label="q4" shape=doublecircle];
                n1 -> q10[label="SG1"];
                q10 -> q11[label="a"];
                q11 -> q12[label="b"];
@@ -217,6 +217,16 @@ added.
 \end{figure}
 
 \subsection{Appliance on extraction of patterns}
+The text data in combination with the user markings are not just plain text and
+thus we can not create a DAWG out of them without a few adaptations to the
+structure.
+
+Adaption for our data
+
+Non determinism
+
+How to get best match
+
 The algorithm for minimizing DAWGs can not be applied directly on the user
 generated pattern. This is mainly because there is no conclusive information
 about the contents of the pattern and therefore non deterministic choices have

diff --git a/thesis2/appoverview.eps b/thesis2/appoverview.eps
index 571e9b6..c6f30bb 100644 (file)
--- a/thesis2/appoverview.eps
+++ b/thesis2/appoverview.eps
@@ -1,8 +1,8 @@
 %!PS-Adobe-3.0 EPSF-3.0
-%%Creator: graphviz version 2.36.0 (20140111.2315)
+%%Creator: graphviz version 2.38.0 (20140413.2041)
 %%Title: %3
 %%Pages: 1
-%%BoundingBox: 36 36 641 154
+%%BoundingBox: 36 36 766 153
 %%EndComments
 save
 %%BeginProlog
@@ -179,211 +179,211 @@ def
 %%EndSetup
 setupLatin1
 %%Page: 1 1
-%%PageBoundingBox: 36 36 641 154
+%%PageBoundingBox: 36 36 766 153
 %%PageOrientation: Portrait
 0 0 1 beginpage
 gsave
-36 36 605 118 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 92 26.95 18 ellipse_path stroke
+32.5 91 32.49 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-14 88.3 moveto 26 (User) alignedtext
+15.5 87.3 moveto 34 (User) alignedtext
 grestore
 % Frontend
 gsave
 1 setlinewidth
 0 0 0 nodecolor
-132 92 42.37 18 ellipse_path stroke
+154.5 91 53.89 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-107.5 88.3 moveto 49 (Frontend) alignedtext
+121 87.3 moveto 67 (Frontend) alignedtext
 grestore
 % User->Frontend
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 54.48 92 moveto
-62.8 92 71.13 92 79.45 92 curveto
+newpath 65.38 91 moveto
+73.71 91 82.04 91 90.38 91 curveto
 stroke
 0 0 0 edgecolor
-newpath 79.61 95.5 moveto
-89.61 92 lineto
-79.61 88.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.61 95.5 moveto
-89.61 92 lineto
-79.61 88.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 92 41.39 18 ellipse_path stroke
+295.5 91 51.19 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-227 88.3 moveto 48 (Backend) alignedtext
+264 87.3 moveto 63 (Backend) alignedtext
 grestore
 % Frontend->Backend
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 174.3 92 moveto
-182.68 92 191.06 92 199.43 92 curveto
+newpath 208.47 91 moveto
+216.85 91 225.23 91 233.61 91 curveto
 stroke
 0 0 0 edgecolor
-newpath 199.65 95.5 moveto
-209.65 92 lineto
-199.65 88.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 95.5 moveto
-209.65 92 lineto
-199.65 88.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 92 38.49 18 ellipse_path stroke
+512.5 91 48.19 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-403 88.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.68 92 moveto
-317.8 92 349.91 92 376.21 92 curveto
+newpath 346.92 91 moveto
+379.07 91 420.55 91 453.96 91 curveto
 stroke
 0 0 0 edgecolor
-newpath 376.34 95.5 moveto
-386.34 92 lineto
-376.34 88.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.34 95.5 moveto
-386.34 92 lineto
-376.34 88.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 98.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 92 42.35 18 ellipse_path stroke
+668.5 91 53.89 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-530 88.3 moveto 50 (Database) alignedtext
+635 87.3 moveto 67 (Database) alignedtext
 grestore
 % Crawler->Database
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 463.65 92 moveto
-475.7 92 489.2 92 502.05 92 curveto
+newpath 561 91 moveto
+574.6 91 589.61 91 603.99 91 curveto
 stroke
 0 0 0 edgecolor
-newpath 502.18 95.5 moveto
-512.18 92 lineto
-502.18 88.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.18 95.5 moveto
-512.18 92 lineto
-502.18 88.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.05 98.8 moveto 31 (XML) alignedtext
+569.57 97.8 moveto 36 (XML) alignedtext
 grestore
 % Source
 gsave
 1 setlinewidth
 0 0 0 nodecolor
-425 18 35.15 18 ellipse_path stroke
+512.5 18 42.79 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-406 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.16 73.94 moveto
-418.28 65.6 418.04 55.36 418.44 46 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 421.94 46.17 moveto
-419.17 35.94 lineto
-414.96 45.66 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 421.94 46.17 moveto
-419.17 35.94 lineto
-414.96 45.66 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 394.05 26.51 moveto
-350.66 37.05 269.29 56.87 200 74 curveto
-192.61 75.83 184.77 77.78 177.14 79.68 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.14 76.32 moveto
-167.28 82.14 lineto
-177.83 83.11 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.14 76.32 moveto
-167.28 82.14 lineto
-177.83 83.11 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 430.83 35.94 moveto
-431.72 44.26 431.96 54.49 431.56 63.86 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.07 63.71 moveto
-430.84 73.94 lineto
-435.05 64.21 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.07 63.71 moveto
-430.84 73.94 lineto
-435.05 64.21 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 4329e17..ac52415 100644 (file)
--- a/thesis2/backend.eps
+++ b/thesis2/backend.eps
@@ -1,8 +1,8 @@
 %!PS-Adobe-3.0 EPSF-3.0
-%%Creator: graphviz version 2.36.0 (20140111.2315)
+%%Creator: graphviz version 2.38.0 (20140413.2041)
 %%Title: %3
 %%Pages: 1
-%%BoundingBox: 36 36 914 152
+%%BoundingBox: 36 36 1036 152
 %%EndComments
 save
 %%BeginProlog
@@ -179,40 +179,40 @@ def
 %%EndSetup
 setupLatin1
 %%Page: 1 1
-%%PageBoundingBox: 36 36 914 152
+%%PageBoundingBox: 36 36 1036 152
 %%PageOrientation: Portrait
 0 0 1 beginpage
 gsave
-36 36 878 116 boxprim clip newpath
+36 36 1000 116 boxprim clip newpath
 1 1 set_scale 0 rotate 40 40 translate
 % q0
 % HTML data
 gsave
 1 setlinewidth
 0 0 0 nodecolor
-146 18 53.09 18 ellipse_path stroke
+155.34 18 64.19 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-113 14.3 moveto 66 (HTML data) alignedtext
+113.84 14.3 moveto 83 (HTML data) alignedtext
 grestore
 % q0->HTML data
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 54.26 18 moveto
-62.66 18 72.35 18 82.2 18 curveto
+newpath 54.18 18 moveto
+62.17 18 71.38 18 80.92 18 curveto
 stroke
 0 0 0 edgecolor
-newpath 82.48 21.5 moveto
-92.48 18 lineto
-82.48 14.5 lineto
+newpath 80.93 21.5 moveto
+90.93 18 lineto
+80.93 14.5 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 82.48 21.5 moveto
-92.48 18 lineto
-82.48 14.5 lineto
+newpath 80.93 21.5 moveto
+90.93 18 lineto
+80.93 14.5 lineto
 closepath stroke
 grestore
 % q1
@@ -220,184 +220,184 @@ grestore
 gsave
 1 setlinewidth
 0 0 0 nodecolor
-288 47 50.09 18 ellipse_path stroke
+317.78 47 61.19 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-257.5 43.3 moveto 61 (Table rows) alignedtext
+278.78 43.3 moveto 78 (Table rows) alignedtext
 grestore
 % HTML data->Table rows
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 192.07 27.34 moveto
-205.45 30.11 220.22 33.17 234.05 36.03 curveto
+newpath 209.77 27.66 moveto
+224.28 30.28 240.12 33.14 255.06 35.84 curveto
 stroke
 0 0 0 edgecolor
-newpath 233.42 39.48 moveto
-243.92 38.08 lineto
-234.84 32.62 lineto
+newpath 254.76 39.35 moveto
+265.23 37.68 lineto
+256.01 32.46 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 233.42 39.48 moveto
-243.92 38.08 lineto
-234.84 32.62 lineto
+newpath 254.76 39.35 moveto
+265.23 37.68 lineto
+256.01 32.46 lineto
 closepath stroke
 grestore
 % Dictionary
 gsave
 1 setlinewidth
 0 0 0 nodecolor
-730 44 48.19 18 ellipse_path stroke
+840.77 44 59.59 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-701 40.3 moveto 58 (Dictionary) alignedtext
+802.77 40.3 moveto 76 (Dictionary) alignedtext
 grestore
 % HTML data->Dictionary
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 193.18 9.55 moveto
-220.39 5.28 255.54 1 287 1 curveto
-287 1 287 1 613 1 curveto
-641.75 1 672.16 12.76 694.62 23.98 curveto
+newpath 211.88 9.2 moveto
+242.7 5.05 281.77 1 316.78 1 curveto
+316.78 1 316.78 1 707.92 1 curveto
+740.37 1 775.2 12.92 800.91 24.21 curveto
 stroke
 0 0 0 edgecolor
-newpath 693.25 27.21 moveto
-703.73 28.72 lineto
-696.48 21 lineto
+newpath 799.74 27.52 moveto
+810.29 28.48 lineto
+802.63 21.15 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 693.25 27.21 moveto
-703.73 28.72 lineto
-696.48 21 lineto
+newpath 799.74 27.52 moveto
+810.29 28.48 lineto
+802.63 21.15 lineto
 closepath stroke
 0 0 0 edgecolor
 14 /Times-Roman set_font
-376.5 4.8 moveto 97 (Description fields) alignedtext
+415.88 4.8 moveto 127 (Description fields) alignedtext
 grestore
 % Node lists
 gsave
 1 setlinewidth
 0 0 0 nodecolor
-425 90 46.29 18 ellipse_path stroke
+479.38 90 57.69 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-397.5 86.3 moveto 55 (Node lists) alignedtext
+442.88 86.3 moveto 73 (Node lists) alignedtext
 grestore
 % Table rows->Node lists
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 326.25 58.86 moveto
-342.56 64.06 361.84 70.2 378.95 75.65 curveto
+newpath 363.66 59.09 moveto
+382.83 64.26 405.34 70.32 425.32 75.71 curveto
 stroke
 0 0 0 edgecolor
-newpath 378.14 79.07 moveto
-388.73 78.77 lineto
-380.27 72.4 lineto
+newpath 424.64 79.15 moveto
+435.21 78.37 lineto
+426.46 72.39 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 378.14 79.07 moveto
-388.73 78.77 lineto
-380.27 72.4 lineto
+newpath 424.64 79.15 moveto
+435.21 78.37 lineto
+426.46 72.39 lineto
 closepath stroke
 grestore
 % Table rows->Dictionary
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 338.19 46.66 moveto
-420.19 46.11 584.38 44.99 671.55 44.39 curveto
+newpath 379.06 46.65 moveto
+476.42 46.09 667.77 44.99 770.56 44.4 curveto
 stroke
 0 0 0 edgecolor
-newpath 671.81 47.89 moveto
-681.79 44.32 lineto
-671.77 40.89 lineto
+newpath 770.85 47.9 moveto
+780.83 44.34 lineto
+770.81 40.9 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 671.81 47.89 moveto
-681.79 44.32 lineto
-671.77 40.89 lineto
+newpath 770.85 47.9 moveto
+780.83 44.34 lineto
+770.81 40.9 lineto
 closepath stroke
 0 0 0 edgecolor
 14 /Times-Roman set_font
-492 48.8 moveto 70 (Original text) alignedtext
+560.88 48.8 moveto 91 (Original text) alignedtext
 grestore
 % Dawg
 gsave
 1 setlinewidth
 0 0 0 nodecolor
-612 90 31.7 18 ellipse_path stroke
+706.92 90 37.09 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-595.5 86.3 moveto 33 (Dawg) alignedtext
+686.42 86.3 moveto 41 (Dawg) alignedtext
 grestore
 % Node lists->Dawg
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 471.26 90 moveto
-501.36 90 540.59 90 569.82 90 curveto
+newpath 537.29 90 moveto
+575.18 90 624.33 90 659.78 90 curveto
 stroke
 0 0 0 edgecolor
-newpath 570.1 93.5 moveto
-580.1 90 lineto
-570.1 86.5 lineto
+newpath 659.85 93.5 moveto
+669.85 90 lineto
+659.85 86.5 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 570.1 93.5 moveto
-580.1 90 lineto
-570.1 86.5 lineto
+newpath 659.85 93.5 moveto
+669.85 90 lineto
+659.85 86.5 lineto
 closepath stroke
 grestore
 % Dawg->Dictionary
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 638.46 79.91 moveto
-652.49 74.34 670.27 67.29 686.35 60.91 curveto
+newpath 737.51 79.68 moveto
+753.27 74.18 773.06 67.27 791.02 61.01 curveto
 stroke
 0 0 0 edgecolor
-newpath 688.1 63.99 moveto
-696.1 57.05 lineto
-685.52 57.48 lineto
+newpath 792.48 64.21 moveto
+800.77 57.61 lineto
+790.17 57.6 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 688.1 63.99 moveto
-696.1 57.05 lineto
-685.52 57.48 lineto
+newpath 792.48 64.21 moveto
+800.77 57.61 lineto
+790.17 57.6 lineto
 closepath stroke
 grestore
 % Dictionary->q1
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 778.4 44 moveto
-787.53 44 796.96 44 805.67 44 curveto
+newpath 900.88 44 moveto
+909.91 44 919 44 927.34 44 curveto
 stroke
 0 0 0 edgecolor
-newpath 805.88 47.5 moveto
-815.88 44 lineto
-805.88 40.5 lineto
+newpath 927.45 47.5 moveto
+937.45 44 lineto
+927.45 40.5 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 805.88 47.5 moveto
-815.88 44 lineto
-805.88 40.5 lineto
+newpath 927.45 47.5 moveto
+937.45 44 lineto
+927.45 40.5 lineto
 closepath stroke
 grestore
 endpage

diff --git a/thesis2/inccons.dot b/thesis2/inccons.dot
index d9add0b..5351543 100644 (file)
--- a/thesis2/inccons.dot
+++ b/thesis2/inccons.dot
@@ -23,14 +23,14 @@ q30 [label="q0"];
 q31 [label="q1"];
 q32 [label="q2"];
 q33 [label="q3"];
-q34 [label="q4"ishape=doublecircle];
+q34 [label="q4" shape=doublecircle];
 q35 [label="q5"];
 n3 -> q30[label="SG3"];
 q30 -> q31[label="a"];
 q31 -> q32[label="b"];
 q32 -> q33[label="c"];
 q33 -> q34[label="d"];
-q33 -> q34[label="f"iconstraint=false];
+q33 -> q34[label="f" constraint=false];
 q31 -> q35[label="e"];
 q35 -> q33[label="c"];
 
@@ -39,7 +39,7 @@ q20 [label="q0"];
 q21 [label="q1"];
 q22 [label="q2"];
 q23 [label="q3"];
-q24 [label="q4"ishape=doublecircle];
+q24 [label="q4" shape=doublecircle];
 q25 [label="q5"];
 n2 -> q20[label="SG2"];
 q20 -> q21[label="a"];
@@ -54,7 +54,7 @@ q10 [label="q0"];
 q11 [label="q1"];
 q12 [label="q2"];
 q13 [label="q3"];
-q14 [label="q4"ishape=doublecircle];
+q14 [label="q4" shape=doublecircle];
 n1 -> q10[label="SG1"];
 q10 -> q11[label="a"];
 q11 -> q12[label="b"];

diff --git a/thesis2/nodelistexample.eps b/thesis2/nodelistexample.eps
index c08abf1..2f64d1a 100644 (file)
--- a/thesis2/nodelistexample.eps
+++ b/thesis2/nodelistexample.eps
@@ -1,8 +1,8 @@
 %!PS-Adobe-3.0 EPSF-3.0
-%%Creator: graphviz version 2.36.0 (20140111.2315)
+%%Creator: graphviz version 2.38.0 (20140413.2041)
 %%Title: %3
 %%Pages: 1
-%%BoundingBox: 36 36 988 139
+%%BoundingBox: 36 36 1058 143
 %%EndComments
 save
 %%BeginProlog
@@ -179,24 +179,24 @@ def
 %%EndSetup
 setupLatin1
 %%Page: 1 1
-%%PageBoundingBox: 36 36 988 139
+%%PageBoundingBox: 36 36 1058 143
 %%PageOrientation: Portrait
 0 0 1 beginpage
 gsave
-36 36 952 103 boxprim clip newpath
+36 36 1022 107 boxprim clip newpath
 1 1 set_scale 0 rotate 40 40 translate
 % n0
 % n9
 gsave
 1 setlinewidth
 0 0 0 nodecolor
-920 72 19.5 19.5 ellipse_path stroke
+987.75 72 22.96 22.96 ellipse_path stroke
 1 setlinewidth
 0 0 0 nodecolor
-920 72 23.5 23.5 ellipse_path stroke
+987.75 72 27 27 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-913 68.3 moveto 14 (n9) alignedtext
+978.25 68.3 moveto 19 (n9) alignedtext
 grestore
 % n1
 gsave
@@ -205,254 +205,254 @@ gsave
 27 72 27 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-20 68.3 moveto 14 (n1) alignedtext
+17.5 68.3 moveto 19 (n1) alignedtext
 grestore
 % n2
 gsave
 1 setlinewidth
 0 0 0 nodecolor
-159 72 27 18 ellipse_path stroke
+174 72 27 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-152 68.3 moveto 14 (n2) alignedtext
+164.5 68.3 moveto 19 (n2) alignedtext
 grestore
 % n1->n2
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 54.31 72 moveto
-73.69 72 100.29 72 121.7 72 curveto
+newpath 54.26 72 moveto
+77.36 72 111.2 72 136.85 72 curveto
 stroke
 0 0 0 edgecolor
-newpath 121.73 75.5 moveto
-131.73 72 lineto
-121.73 68.5 lineto
+newpath 136.94 75.5 moveto
+146.94 72 lineto
+136.94 68.5 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 121.73 75.5 moveto
-131.73 72 lineto
-121.73 68.5 lineto
+newpath 136.94 75.5 moveto
+146.94 72 lineto
+136.94 68.5 lineto
 closepath stroke
 0 0 0 edgecolor
 14 /Times-Roman set_font
-72 75.8 moveto 42 (<time>) alignedtext
+72 75.8 moveto 57 (<time>) alignedtext
 grestore
 % n3
 gsave
 1 setlinewidth
 0 0 0 nodecolor
-259 72 27 18 ellipse_path stroke
+277 72 27 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-252 68.3 moveto 14 (n3) alignedtext
+267.5 68.3 moveto 19 (n3) alignedtext
 grestore
 % n2->n3
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 186 72 moveto
-196.97 72 209.92 72 221.79 72 curveto
+newpath 201.01 72 moveto
+212.7 72 226.7 72 239.42 72 curveto
 stroke
 0 0 0 edgecolor
-newpath 221.87 75.5 moveto
-231.87 72 lineto
-221.87 68.5 lineto
+newpath 239.73 75.5 moveto
+249.73 72 lineto
+239.73 68.5 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 221.87 75.5 moveto
-231.87 72 lineto
-221.87 68.5 lineto
+newpath 239.73 75.5 moveto
+249.73 72 lineto
+239.73 68.5 lineto
 closepath stroke
 0 0 0 edgecolor
 14 /Times-Roman set_font
-204.5 75.8 moveto 9 (',') alignedtext
+219 75.8 moveto 13 (',') alignedtext
 grestore
 % n4
 gsave
 1 setlinewidth
 0 0 0 nodecolor
-361 72 27 18 ellipse_path stroke
+383 72 27 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-354 68.3 moveto 14 (n4) alignedtext
+373.5 68.3 moveto 19 (n4) alignedtext
 grestore
 % n3->n4
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 286.01 72 moveto
-297.5 72 311.19 72 323.66 72 curveto
+newpath 304.24 72 moveto
+316.81 72 332.05 72 345.71 72 curveto
 stroke
 0 0 0 edgecolor
-newpath 323.77 75.5 moveto
-333.77 72 lineto
-323.77 68.5 lineto
+newpath 345.76 75.5 moveto
+355.76 72 lineto
+345.76 68.5 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 323.77 75.5 moveto
-333.77 72 lineto
-323.77 68.5 lineto
+newpath 345.76 75.5 moveto
+355.76 72 lineto
+345.76 68.5 lineto
 closepath stroke
 0 0 0 edgecolor
 14 /Times-Roman set_font
-304 75.8 moveto 12 ('_') alignedtext
+322 75.8 moveto 16 ('_') alignedtext
 grestore
 % n5
 gsave
 1 setlinewidth
 0 0 0 nodecolor
-491 72 27 18 ellipse_path stroke
+529 72 27 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-484 68.3 moveto 14 (n5) alignedtext
+519.5 68.3 moveto 19 (n5) alignedtext
 grestore
 % n4->n5
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 388.21 72 moveto
-407.11 72 432.85 72 453.72 72 curveto
+newpath 410.08 72 moveto
+432.87 72 466.21 72 491.62 72 curveto
 stroke
 0 0 0 edgecolor
-newpath 453.82 75.5 moveto
-463.82 72 lineto
-453.82 68.5 lineto
+newpath 491.63 75.5 moveto
+501.63 72 lineto
+491.63 68.5 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 453.82 75.5 moveto
-463.82 72 lineto
-453.82 68.5 lineto
+newpath 491.63 75.5 moveto
+501.63 72 lineto
+491.63 68.5 lineto
 closepath stroke
 0 0 0 edgecolor
 14 /Times-Roman set_font
-406 75.8 moveto 40 (<date>) alignedtext
+428 75.8 moveto 56 (<date>) alignedtext
 grestore
 % n6
 gsave
 1 setlinewidth
 0 0 0 nodecolor
-593 72 27 18 ellipse_path stroke
+635 72 27 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-586 68.3 moveto 14 (n6) alignedtext
+625.5 68.3 moveto 19 (n6) alignedtext
 grestore
 % n5->n6
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 518.01 72 moveto
-529.5 72 543.19 72 555.66 72 curveto
+newpath 556.24 72 moveto
+568.81 72 584.05 72 597.71 72 curveto
 stroke
 0 0 0 edgecolor
-newpath 555.77 75.5 moveto
-565.77 72 lineto
-555.77 68.5 lineto
+newpath 597.76 75.5 moveto
+607.76 72 lineto
+597.76 68.5 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 555.77 75.5 moveto
-565.77 72 lineto
-555.77 68.5 lineto
+newpath 597.76 75.5 moveto
+607.76 72 lineto
+597.76 68.5 lineto
 closepath stroke
 0 0 0 edgecolor
 14 /Times-Roman set_font
-536 75.8 moveto 12 ('_') alignedtext
+574 75.8 moveto 16 ('_') alignedtext
 grestore
 % n7
 gsave
 1 setlinewidth
 0 0 0 nodecolor
-693 72 27 18 ellipse_path stroke
+738 72 27 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-686 68.3 moveto 14 (n7) alignedtext
+728.5 68.3 moveto 19 (n7) alignedtext
 grestore
 % n6->n7
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 620 72 moveto
-630.97 72 643.92 72 655.79 72 curveto
+newpath 662.01 72 moveto
+673.7 72 687.7 72 700.42 72 curveto
 stroke
 0 0 0 edgecolor
-newpath 655.87 75.5 moveto
-665.87 72 lineto
-655.87 68.5 lineto
+newpath 700.73 75.5 moveto
+710.73 72 lineto
+700.73 68.5 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 655.87 75.5 moveto
-665.87 72 lineto
-655.87 68.5 lineto
+newpath 700.73 75.5 moveto
+710.73 72 lineto
+700.73 68.5 lineto
 closepath stroke
 0 0 0 edgecolor
 14 /Times-Roman set_font
-638 75.8 moveto 10 ('-') alignedtext
+680 75.8 moveto 13 ('-') alignedtext
 grestore
 % n8
 gsave
 1 setlinewidth
 0 0 0 nodecolor
-795 72 27 18 ellipse_path stroke
+844 72 27 18 ellipse_path stroke
 0 0 0 nodecolor
 14 /Times-Roman set_font
-788 68.3 moveto 14 (n8) alignedtext
+834.5 68.3 moveto 19 (n8) alignedtext
 grestore
 % n7->n8
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 720.01 72 moveto
-731.5 72 745.19 72 757.66 72 curveto
+newpath 765.24 72 moveto
+777.81 72 793.05 72 806.71 72 curveto
 stroke
 0 0 0 edgecolor
-newpath 757.77 75.5 moveto
-767.77 72 lineto
-757.77 68.5 lineto
+newpath 806.76 75.5 moveto
+816.76 72 lineto
+806.76 68.5 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 757.77 75.5 moveto
-767.77 72 lineto
-757.77 68.5 lineto
+newpath 806.76 75.5 moveto
+816.76 72 lineto
+806.76 68.5 lineto
 closepath stroke
 0 0 0 edgecolor
 14 /Times-Roman set_font
-738 75.8 moveto 12 ('_') alignedtext
+783 75.8 moveto 16 ('_') alignedtext
 grestore
 % n8->n9
 gsave
 1 setlinewidth
 0 0 0 edgecolor
-newpath 822.09 72 moveto
-840.74 72 865.98 72 886.02 72 curveto
+newpath 871.33 72 moveto
+893.61 72 925.76 72 950.47 72 curveto
 stroke
 0 0 0 edgecolor
-newpath 886.26 75.5 moveto
-896.26 72 lineto
-886.26 68.5 lineto
+newpath 950.56 75.5 moveto
+960.56 72 lineto
+950.56 68.5 lineto
 closepath fill
 1 setlinewidth
 solid
 0 0 0 edgecolor
-newpath 886.26 75.5 moveto
-896.26 72 lineto
-886.26 68.5 lineto
+newpath 950.56 75.5 moveto
+960.56 72 lineto
+950.56 68.5 lineto
 closepath stroke
 0 0 0 edgecolor
 14 /Times-Roman set_font
-840 75.8 moveto 38 (<title>) alignedtext
+889 75.8 moveto 54 (<title>) alignedtext
 grestore
 endpage
 showpage