diff --git a/content.tex b/content.tex index abc2895..de29fca 100644 --- a/content.tex +++ b/content.tex @@ -11,7 +11,14 @@ \component content-other/acknowledgements \setupwhitespace[none] +\startmode[zwartwit] +\setupinteraction[focus=standard, color=black, contrastcolor=black, style=normal] +\stopmode \completecontent[criterium=all] +\startmode[zwartwit] +\setupinteraction[focus=standard, color=darkgray, contrastcolor=darkgray, style=normal] +\stopmode +\page[empty]\page[empty] \stopfrontmatter diff --git a/content/applying-automata-learning.tex b/content/applying-automata-learning.tex index 33fad74..1320248 100644 --- a/content/applying-automata-learning.tex +++ b/content/applying-automata-learning.tex @@ -160,8 +160,8 @@ Other products can be connected to an engine that pre- or postprocess the paper, (eia) edge[conn] (c); \startscope[on background layer] - \node (es) [rounded corners, fit=(eia) (m) (f) (os), inner sep=11pt, fill=black!10] {}; - \node at (es.north) [rounded corners, fill=black!10] {Engine Software}; + \node (es) [rounded corners, fit=(eia) (m) (f) (os), inner sep=11pt, fill=lgrijs] {}; + \node at (es.north) [rounded corners, fill=lgrijs] {Engine Software}; \stopscope \stoptikzpicture} \stopplacefigure @@ -206,7 +206,7 @@ Finally, it handles status transitions when an error occurs. \node (acm) [comp, right of=ehm] {Action Control Manager}; \node (oc) [coms, right of=acm] {Other Client}; \node (tc) [comp, below of=ehm] {Top Capsule}; -\node (esm) [comp, below of=acm, fill=black!10] {Engine Status Manager}; +\node (esm) [comp, below of=acm, fill=lgrijs] {Engine Status Manager}; \node (im) [comp, below of=oc] {Information Manager}; \node (fn) [coms, below of=esm] {Function}; @@ -268,7 +268,7 @@ These messages are placed in a queue to be processed later. reference=fig:esm-states] \hbox{\switchtobodyfont[small]\starttikzpicture [comp/.style={draw, rounded corners, minimum width=1.7cm, minimum height=0.6cm, inner sep=2pt}, - grco/.style={comp, fill=black!10}, + grco/.style={comp, fill=lgrijs}, conn/.style={->, shorten >=1pt}, dot/.style={fill, circle}, x=1.4cm, y=-0.45cm] diff --git a/content/introduction.tex b/content/introduction.tex index 02a3469..75eae17 100644 --- a/content/introduction.tex +++ b/content/introduction.tex @@ -288,7 +288,7 @@ In this example, a test suite should include sequences such as \playstop\,\spin\ (tr) edge [bend right] node [above] {\spin} (tl) (tr) edge [bend right] node [left] {\playstop} (br) (br) edge [bend right] node [right] {\playstop} (tr) - (br) edge [loop below, color=red] node [above] {\spin} (br); + (br) edge [loop below, color=darkred] node [above] {\spin} (br); \stoptikzpicture}}{(a)} {\hbox{\starttikzpicture[node distance=3cm, bend angle=10] \node[state, initial above, align=center] (tl) {slow\\spinning}; @@ -302,7 +302,7 @@ In this example, a test suite should include sequences such as \playstop\,\spin\ (bl) edge [bend right] node [right] {\playstop} (tl) (bl) edge [bend right] node [below] {\spin} (br) (tr) edge [bend right] node [above] {\spin} (tl) - (tr) edge [color=red] node [below right] {\playstop} (bl) + (tr) edge [color=darkred] node [below right] {\playstop} (bl) (br) edge [bend right] node [right] {\playstop} (tr) (br) edge [bend right] node [above] {\spin} (bl); \stoptikzpicture}}{(b)} diff --git a/content/learning-nominal-automata.tex b/content/learning-nominal-automata.tex index 53490f6..64533cd 100644 --- a/content/learning-nominal-automata.tex +++ b/content/learning-nominal-automata.tex @@ -109,9 +109,9 @@ As an example, and to set notation, consider the following table (over the alpha \draw[decorate, decoration=brace] (tab-1-2.north) -- node[above]{$E$} (tab-1-4.north) ; \draw[decorate, decoration=brace] (tab-4-1.west) -- node[left]{$S \cup S \Lext A$} (tab-2-1.west); -\node[fit=(tab-2-2)(tab-2-3)(tab-2-4), dotted, draw, inner sep=-2pt] (r1) {}; -\node[fit=(tab-3-2)(tab-3-3)(tab-3-4), dotted, draw, inner sep=-2pt] (r2) {}; -\node[fit=(tab-4-2)(tab-4-3)(tab-4-4), dotted, draw, inner sep=-2pt] (r3) {}; +\node[fit=(tab-2-2)(tab-2-3)(tab-2-4), dashed, draw, inner sep=-2pt] (r1) {}; +\node[fit=(tab-3-2)(tab-3-3)(tab-3-4), dashed, draw, inner sep=-2pt] (r2) {}; +\node[fit=(tab-4-2)(tab-4-3)(tab-4-4), dashed, draw, inner sep=-2pt] (r3) {}; \node[right=1cm of tab](row){$row \colon S \cup S \Lext A \to 2^E$}; \node[below=0em of row](rowd){$row(u)(v) = 1 \iff uv \in \lang$}; diff --git a/content/minimal-separating-sequences.tex b/content/minimal-separating-sequences.tex index 80662c5..ef255e0 100644 --- a/content/minimal-separating-sequences.tex +++ b/content/minimal-separating-sequences.tex @@ -671,15 +671,15 @@ We note that different slopes imply different complexity classes, since both axe \startcombination[2*1] {\starttikzpicture \startloglogaxis[width=0.5\textwidth, xtick={500, 1000, 2000, 3000}, xticklabels={$500$, $1000$, $2000$, $3000$}] -\addplot[color=darkgray] table[x=states, y=Moore] {esm.table}; +\addplot[color=grijs] table[x=states, y=Moore] {esm.table}; \addplot[color=black] table[x=states, y=Hopcroft] {esm.table}; \stoploglogaxis \stoptikzpicture} {(a) Embedded control software.} {\starttikzpicture \startloglogaxis[width=0.5\textwidth, xtick={4, 64, 2048, 32768}, xticklabels={$2^2$, $2^6$, $2^{11}$, $2^{15}$}] -\addplot[color=darkgray, dashed] table[x=states, y=Moore] {hopcroft_b.table}; +\addplot[color=grijs, dashed] table[x=states, y=Moore] {hopcroft_b.table}; \addplot[color=black, dashed] table[x=states, y=Hopcroft] {hopcroft_b.table}; -\addplot[color=darkgray] table[x=states, y=Moore] {hopcroft_a.table}; +\addplot[color=grijs] table[x=states, y=Moore] {hopcroft_a.table}; \addplot[color=black] table[x=states, y=Hopcroft] {hopcroft_a.table}; \stoploglogaxis \stoptikzpicture} {(b) Class $A$ (dashed) and class $B$ (solid).} diff --git a/content/ordered-nominal-sets.tex b/content/ordered-nominal-sets.tex index 26b2ee3..e9778d7 100644 --- a/content/ordered-nominal-sets.tex +++ b/content/ordered-nominal-sets.tex @@ -723,27 +723,27 @@ This in contrast to both \LOIS{} and \NLambda{}, which take more than $2$ hours list={Running times for minimisation.}, reference=minimize_results] \starttabulate[|l|c|c|cg{.}|cg{.}|cg{.}|cg{.}|][distance=none] -\NC Type \NC $\Nsize(S)$ \NC $\Nsize(S^{\text{min}})$ \VL \ONS{} (s) \NC \color[darkgray]{Gen (s)} \VL \NLambda{} (s) \VL \LOIS{} (s) \NC\NR +\NC Type \NC $\Nsize(S)$ \NC $\Nsize(S^{\text{min}})$ \VL \ONS{} (s) \NC \color[grijs]{Gen (s)} \VL \NLambda{} (s) \VL \LOIS{} (s) \NC\NR \HL -\NC rand$_{5,1}$ (x10) \NC 5 \NC n/a \VL 0.02 \NC \color[darkgray]{n/a} \VL 0.82 \VL 3.14 \NC\NR -\NC rand$_{10,1}$ (x10) \NC 10 \NC n/a \VL 0.03 \NC \color[darkgray]{n/a} \VL 17.03 \VL 92 \NC\NR -\NC rand$_{10,2}$ (x10) \NC 10 \NC n/a \VL 0.09 \NC \color[darkgray]{n/a} \VL 2114 \VL $\infty$ \NC\NR -\NC rand$_{15,1}$ (x10) \NC 15 \NC n/a \VL 0.04 \NC \color[darkgray]{n/a} \VL 87 \VL 620 \NC\NR -\NC rand$_{15,2}$ (x10) \NC 15 \NC n/a \VL 0.11 \NC \color[darkgray]{n/a} \VL 3346 \VL $\infty$ \NC\NR -\NC rand$_{15,3}$ (x10) \NC 15 \NC n/a \VL 0.46 \NC \color[darkgray]{n/a} \VL $\infty$ \VL $\infty$ \NC\NR +\NC rand$_{5,1}$ (x10) \NC 5 \NC n/a \VL 0.02 \NC \color[grijs]{n/a} \VL 0.82 \VL 3.14 \NC\NR +\NC rand$_{10,1}$ (x10) \NC 10 \NC n/a \VL 0.03 \NC \color[grijs]{n/a} \VL 17.03 \VL 92 \NC\NR +\NC rand$_{10,2}$ (x10) \NC 10 \NC n/a \VL 0.09 \NC \color[grijs]{n/a} \VL 2114 \VL $\infty$ \NC\NR +\NC rand$_{15,1}$ (x10) \NC 15 \NC n/a \VL 0.04 \NC \color[grijs]{n/a} \VL 87 \VL 620 \NC\NR +\NC rand$_{15,2}$ (x10) \NC 15 \NC n/a \VL 0.11 \NC \color[grijs]{n/a} \VL 3346 \VL $\infty$ \NC\NR +\NC rand$_{15,3}$ (x10) \NC 15 \NC n/a \VL 0.46 \NC \color[grijs]{n/a} \VL $\infty$ \VL $\infty$ \NC\NR \HL -\NC FIFO($2$) \NC 13 \NC 6 \VL 0.01 \NC \color[darkgray]{0.01} \VL 1.37 \VL 0.24 \NC\NR -\NC FIFO($3$) \NC 65 \NC 19 \VL 0.38 \NC \color[darkgray]{0.09} \VL 11.59 \VL 2.4 \NC\NR -\NC FIFO($4$) \NC 440 \NC 94 \VL 39.11 \NC \color[darkgray]{1.60} \VL 76 \VL 14.95 \NC\NR -\NC FIFO($5$) \NC 3686 \NC 635 \VL $\infty$ \NC \color[darkgray]{39.78} \VL 402 \VL 71 \NC\NR +\NC FIFO($2$) \NC 13 \NC 6 \VL 0.01 \NC \color[grijs]{0.01} \VL 1.37 \VL 0.24 \NC\NR +\NC FIFO($3$) \NC 65 \NC 19 \VL 0.38 \NC \color[grijs]{0.09} \VL 11.59 \VL 2.4 \NC\NR +\NC FIFO($4$) \NC 440 \NC 94 \VL 39.11 \NC \color[grijs]{1.60} \VL 76 \VL 14.95 \NC\NR +\NC FIFO($5$) \NC 3686 \NC 635 \VL $\infty$ \NC \color[grijs]{39.78} \VL 402 \VL 71 \NC\NR \HL -\NC $ww(2)$ \NC 8 \NC 8 \VL 0.00 \NC \color[darkgray]{0.00} \VL 0.14 \VL 0.03 \NC\NR -\NC $ww(3)$ \NC 24 \NC 24 \VL 0.19 \NC \color[darkgray]{0.02} \VL 0.88 \VL 0.16 \NC\NR -\NC $ww(4)$ \NC 112 \NC 112 \VL 26.44 \NC \color[darkgray]{0.25} \VL 3.41 \VL 0.61 \NC\NR -\NC $ww(5)$ \NC 728 \NC 728 \VL $\infty$ \NC \color[darkgray]{6.37} \VL 10.54 \VL 1.80 \NC\NR +\NC $ww(2)$ \NC 8 \NC 8 \VL 0.00 \NC \color[grijs]{0.00} \VL 0.14 \VL 0.03 \NC\NR +\NC $ww(3)$ \NC 24 \NC 24 \VL 0.19 \NC \color[grijs]{0.02} \VL 0.88 \VL 0.16 \NC\NR +\NC $ww(4)$ \NC 112 \NC 112 \VL 26.44 \NC \color[grijs]{0.25} \VL 3.41 \VL 0.61 \NC\NR +\NC $ww(5)$ \NC 728 \NC 728 \VL $\infty$ \NC \color[grijs]{6.37} \VL 10.54 \VL 1.80 \NC\NR \HL -\NC $\Lmax$ \NC 5 \NC 3 \VL 0.00 \NC \color[darkgray]{0.00} \VL 2.06 \VL 0.03 \NC\NR -\NC $\Lint$ \NC 5 \NC 5 \VL 0.00 \NC \color[darkgray]{0.00} \VL 1.55 \VL 0.03 \NC\NR +\NC $\Lmax$ \NC 5 \NC 3 \VL 0.00 \NC \color[grijs]{0.00} \VL 2.06 \VL 0.03 \NC\NR +\NC $\Lint$ \NC 5 \NC 5 \VL 0.00 \NC \color[grijs]{0.00} \VL 1.55 \VL 0.03 \NC\NR \stoptabulate \stopplacetable diff --git a/content/test-methods.tex b/content/test-methods.tex index 6778441..f5954d3 100644 --- a/content/test-methods.tex +++ b/content/test-methods.tex @@ -677,7 +677,7 @@ The transition cover is simply constructed by extending each access sequence wit (0) edge [bend right] node [below] {${b}/0$} (4) (1) edge node [left ] {${a}/0$} (2) (4) edge [bend left] node [right] {${a}/1$} (3); - \path[trans, color=gray] + \path[trans, color=grijs] (0) edge [loop below] node [below] {${c}/0$} (0) (1) edge [bend left] node [above] {${b}/0$, ${c}/0$} (0) (2) edge [bend right] node [below] {${b}/0$, ${c}/0$} (0) @@ -763,7 +763,7 @@ The UIO-method and ADS-method are not applicable in this example because state $ (0) edge [loop below] node [below] {$c/0$} (0) (1) edge node [left ] {$a/0$} (2) (1) edge [bend left] node [above] {$b/0$, $c/0$} (0) - (2) edge [bend right] node [below] {$a/1$, $b/0$, $c/0$} (0) + (2) edge [bend right] node [below] {\color[darkred]{$a/1$}, $b/0$, $c/0$} (0) (3) edge [bend left] node [right] {$a/1$} (4) (3) edge [bend right] node [above] {$b/0$} (0) (3) edge [loop right] node [right] {$c/1$} (3) diff --git a/environment.tex b/environment.tex index 738621a..0490aae 100644 --- a/environment.tex +++ b/environment.tex @@ -5,8 +5,9 @@ \setupexternalfigures[directory={images,../images}] -\definemode[afloop][yes] +% \definemode[afloop][yes] % \definemode[draft][yes] +\definemode[zwartwit][yes] \environment bib \environment font diff --git a/environment/paper.tex b/environment/paper.tex index 93e86b5..a010e8d 100644 --- a/environment/paper.tex +++ b/environment/paper.tex @@ -24,9 +24,6 @@ header=10mm, % nodig? footer=10mm] -% Snijranden -\setuplayout[marking=on] - % Assymetrisch \setuppagenumbering[state=start, style=normal, location={header, right}, alternative=doublesided] @@ -41,4 +38,8 @@ footer=5mm] \stopmode +\startmode[afloop, draft] +\setuplayout[marking=on] % Snijranden +\stopmode + \stopenvironment diff --git a/environment/pdf.tex b/environment/pdf.tex index 9c00d46..2eeb585 100644 --- a/environment/pdf.tex +++ b/environment/pdf.tex @@ -6,6 +6,12 @@ % Klikbare referenties \setupinteraction[state=start, focus=standard, contrastcolor=darkgreen, style=normal] +\startmode[zwartwit] +\setupinteraction[state=start, focus=standard, color=darkgray, contrastcolor=darkgray, style=normal] +\stopmode + +\definecolor[grijs][k=0.5] +\definecolor[lgrijs][k=0.25] % Metadata \setupinteraction