Skip to content

Commit

Permalink
backup
Browse files Browse the repository at this point in the history
  • Loading branch information
Vincent de Bruijn committed Jan 20, 2013
1 parent 5975095 commit cc61f98
Show file tree
Hide file tree
Showing 17 changed files with 792 additions and 576 deletions.
60 changes: 60 additions & 0 deletions Final-thesis/halstead.txt
@@ -0,0 +1,60 @@
Halstead:
1:
\begin{comment}
start:
13 distinct operands
1 distinct operator
33 operands
3 operators

move:
2 new distinct operands
5 new distinct operators
27 operands
6 operators

nextTurn:
0 new distinct operands
1 new distinct operator
13 operands
5 operators

throws:
3 new distinct operands
2 new distinct operators
30 operands
10 operators

$n_1 = 9, n_2 = 18, N_1 = 24, N_2 = 103$
Volume is 127*4.75 = 603.25

IOSTS:
22 distinct operands
5 distinct operators
62 operands
25 operators

$n_1 = 5, n_2 = 22, N_1 = 25, N_2 = 62$
Volume is 87*4.75 = 413.25
\end{comment}

2:

\begin{comment}
start: 12 new operands, 26 operands
?c: 3 new operators, 0 new operands. 5 operators, 17 operands
?c-invalid: 0 new operators, 1 new operand. 2 operators, 14 operands
!retry: 0-0. 1 operator, 2 operands.
!eaten: 0-0. 9 operators, 36 operands
!done: 8 operators, 30 operands
\end{comment}

3:

\begin{comment}
start: 1 - 25. 13 - 46
?o: 1 - 2. 1 - 14
!po: 2 - 3. 4 - 24
?p: 0 - 0. 3 - 18
!pp: 3 -
\end{comment}
29 changes: 29 additions & 0 deletions Final-thesis/img/fwgc/g-fwgc-extended.tikz
@@ -0,0 +1,29 @@
% To use this figure in your LaTeX document
% import the package groove/resources/groove2tikz.sty
%
% Special colors
\begin{tikzpicture}[
% Special color styles
scale=\tikzscale]
\node[node] (n5) at (1.465, -3.425){};
\node[node] (n4) at (1.395, -1.735) {\ml{goat}};
\node[quantnode] (n6) at (2.525, -3.435) {\ml{$\forall$}};
\node[node] (n3) at (2.595, -1.385) {\ml{farmer}};
\node[node] (n0) at (1.345, -2.515) {\ml{bank}};
\node[node] (n1) at (2.575, -2.515) {\ml{bank}};
\path[edge, -](n0.east |- 2.575, -2.515) -- node[lab]{\textit{!=}} (n1) ;
\path[deledge] (n3) -- node[dellab]{at} (n0) ;
\path[newedge] (n4) .. controls (1.600, -1.410) and (1.530, -1.220) .. (1.530, -1.220).. controls (1.510, -1.160) and (1.210, -1.180) .. (1.200, -1.230).. controls (1.200, -1.230) and (1.140, -1.430) .. (n4) ;
\node[newlab] at (1.362, -1.225){moved};
\path[newedge](n3.south -| 2.575, -2.515) -- (n1) ;
\node[newlab] at (2.585, -1.960){at};
\path[quantedge](n5.east |- 2.525, -3.435) -- node[lab]{@} (n6) ;
\path[newedge] (n3) .. controls (2.800, -1.110) and (2.750, -0.940) .. (2.750, -0.940).. controls (2.730, -0.880) and (2.450, -0.880) .. (2.440, -0.930).. controls (2.440, -0.930) and (2.370, -1.100) .. (n3) ;
\node[newlab] at (2.592, -0.935){moved};
\path[deledge] (n5) .. controls (1.730, -3.140) and (1.690, -2.930) .. (1.690, -2.930).. controls (1.680, -2.880) and (1.380, -2.840) .. (1.360, -2.900).. controls (1.360, -2.900) and (1.260, -3.090) .. (n5) ;
\node[dellab] at (1.531, -2.916){moved};
\path[newedge] (n4) -- node[newlab]{at} (n1) ;
\path[deledge](n4.south -| 1.345, -2.515) -- node[dellab]{at} (n0) ;
\userdefinedmacro
\end{tikzpicture}
\renewcommand{\userdefinedmacro}{\relax}
23 changes: 23 additions & 0 deletions Final-thesis/img/fwgc/n-fwgc-extended.tikz
@@ -0,0 +1,23 @@
% To use this figure in your LaTeX document
% import the package groove/resources/groove2tikz.sty
%
% Special colors
\begin{tikzpicture}[
% Special color styles
scale=\tikzscale]
\node[node] (n4) at (1.205, -3.465){};
\node[quantnode] (n5) at (2.205, -3.405) {\ml{$\forall$}};
\node[node] (n0) at (1.125, -2.780) {\ml{bank}};
\node[node] (n1) at (2.225, -2.755) {\ml{bank}};
\node[node] (n2) at (1.695, -2.205) {\ml{farmer}};
\path[newedge] (n2) -- node[newlab]{at} (n1) ;
\path[deledge] (n4) .. controls (0.930, -3.800) and (1.000, -4.050) .. (1.000, -4.050).. controls (1.010, -4.100) and (1.350, -4.110) .. (1.370, -4.060).. controls (1.370, -4.060) and (1.450, -3.820) .. (n4) ;
\node[dellab] at (1.184, -4.055){moved};
\path[newedge] (n2) .. controls (1.890, -1.930) and (1.850, -1.730) .. (1.850, -1.730).. controls (1.830, -1.650) and (1.560, -1.630) .. (1.560, -1.640).. controls (1.560, -1.640) and (1.480, -1.870) .. (n2) ;
\node[newlab] at (1.666, -1.673){moved};
\path[deledge] (n2) -- node[dellab]{at} (n0) ;
\path[quantedge](n4.east |- 2.205, -3.405) -- node[lab]{@} (n5) ;
\path[edge, -](n0.east |- 2.225, -2.755) -- node[lab]{\textit{!=}} (n1) ;
\userdefinedmacro
\end{tikzpicture}
\renewcommand{\userdefinedmacro}{\relax}
29 changes: 29 additions & 0 deletions Final-thesis/img/fwgc/w-fwgc-extended.tikz
@@ -0,0 +1,29 @@
% To use this figure in your LaTeX document
% import the package groove/resources/groove2tikz.sty
%
% Special colors
\begin{tikzpicture}[
% Special color styles
scale=\tikzscale]
\node[node] (n1) at (2.575, -2.515) {\ml{bank}};
\node[node] (n0) at (1.345, -2.515) {\ml{bank}};
\node[node] (n3) at (2.595, -1.385) {\ml{farmer}};
\node[quantnode] (n6) at (2.525, -3.435) {\ml{$\forall$}};
\node[node] (n4) at (1.395, -1.735) {\ml{wolf}};
\node[node] (n5) at (1.465, -3.425){};
\path[edge, -](n0.east |- 2.575, -2.515) -- node[lab]{\textit{!=}} (n1) ;
\path[deledge] (n3) -- node[dellab]{at} (n0) ;
\path[newedge] (n4) .. controls (1.600, -1.410) and (1.530, -1.220) .. (1.530, -1.220).. controls (1.510, -1.160) and (1.210, -1.180) .. (1.200, -1.230).. controls (1.200, -1.230) and (1.140, -1.430) .. (n4) ;
\node[newlab] at (1.362, -1.225){moved};
\path[newedge](n3.south -| 2.575, -2.515) -- (n1) ;
\node[newlab] at (2.585, -1.960){at};
\path[quantedge](n5.east |- 2.525, -3.435) -- node[lab]{@} (n6) ;
\path[newedge] (n3) .. controls (2.800, -1.110) and (2.750, -0.940) .. (2.750, -0.940).. controls (2.730, -0.880) and (2.450, -0.880) .. (2.440, -0.930).. controls (2.440, -0.930) and (2.370, -1.100) .. (n3) ;
\node[newlab] at (2.592, -0.935){moved};
\path[deledge] (n5) .. controls (1.730, -3.140) and (1.690, -2.930) .. (1.690, -2.930).. controls (1.680, -2.880) and (1.380, -2.840) .. (1.360, -2.900).. controls (1.360, -2.900) and (1.260, -3.090) .. (n5) ;
\node[dellab] at (1.531, -2.916){moved};
\path[newedge] (n4) -- node[newlab]{at} (n1) ;
\path[deledge](n4.south -| 1.345, -2.515) -- node[dellab]{at} (n0) ;
\userdefinedmacro
\end{tikzpicture}
\renewcommand{\userdefinedmacro}{\relax}
51 changes: 0 additions & 51 deletions Final-thesis/iosts_scrp.tex
Expand Up @@ -108,12 +108,6 @@
& & $\mathit{s21}\xrightarrow{\mathit{!230}, \mathit{true}, \{\}}\mathit{s22},\mathit{s210}\xrightarrow{\mathit{\tau}, \mathit{true}, \{\}}\mathit{s212},\mathit{s211}\xrightarrow{\mathit{\tau}, \mathit{true}, \{\}}\mathit{s212},$ \\
\end{tabular}

\begin{tabular}{lcp{350px}}
\end{tabular}

\begin{tabular}{lcp{350px}}
\end{tabular}

\begin{tabular}{lcp{350px}}
& & $\mathit{s212}\xrightarrow{\mathit{\tau}, \mathit{true}, \{\}}\mathit{s213},\mathit{s213}\xrightarrow{\mathit{\tau}, \mathit{true}, \{\}}\mathit{s214},\mathit{s214}\xrightarrow{\mathit{\tau}, \mathit{true}, \{\}}\mathit{s233},$ \\
& & $\mathit{s215}\xrightarrow{\mathit{!503}, \mathit{true}, \{\}}\mathit{s218},\mathit{s215}\xrightarrow{\mathit{!502}, \mathit{true}, \{\}}\mathit{s217},\mathit{s215}\xrightarrow{\mathit{!211}, \mathit{true}, \{\}}\mathit{s216},$ \\
Expand Down Expand Up @@ -155,12 +149,6 @@
& & $\mathit{s263}\xrightarrow{\mathit{!202}, \mathit{true}, \{\}}\mathit{s264},\mathit{s263}\xrightarrow{\mathit{!502}, \mathit{true}, \{\}}\mathit{s267},\mathit{s263}\xrightarrow{\mathit{!531}, \mathit{true}, \{\}}\mathit{s265},$ \\
\end{tabular}

\begin{tabular}{lcp{350px}}
\end{tabular}

\begin{tabular}{lcp{350px}}
\end{tabular}

\begin{tabular}{lcp{350px}}
& & $\mathit{s263}\xrightarrow{\mathit{!501}, \mathit{true}, \{\}}\mathit{s266},\mathit{s263}\xrightarrow{\mathit{!503}, \mathit{true}, \{\}}\mathit{s268},\mathit{s264}\xrightarrow{\mathit{\tau}, \mathit{true}, \{\}}\mathit{s274},$ \\
& & $\mathit{s265}\xrightarrow{\mathit{\tau}, \mathit{true}, \{\}}\mathit{s274},\mathit{s266}\xrightarrow{\mathit{\tau}, \mathit{true}, \{\}}\mathit{s274},\mathit{s267}\xrightarrow{\mathit{\tau}, \mathit{true}, \{\}}\mathit{s273},$ \\
Expand Down Expand Up @@ -202,12 +190,6 @@
& & $\mathit{s312}\xrightarrow{\mathit{\tau}, \mathit{true}, \{\}}\mathit{s314},\mathit{s313}\xrightarrow{\mathit{\tau}, \mathit{true}, \{\}}\mathit{s314},\mathit{s314}\xrightarrow{\mathit{\tau}, \mathit{true}, \{\}}\mathit{s315},$ \\
\end{tabular}

\begin{tabular}{lcp{350px}}
\end{tabular}

\begin{tabular}{lcp{350px}}
\end{tabular}

\begin{tabular}{lcp{350px}}
& & $\mathit{s315}\xrightarrow{\mathit{\tau}, \mathit{true}, \{\}}\mathit{s316},\mathit{s316}\xrightarrow{\mathit{\tau}, \mathit{true}, \{\}}\mathit{s357},\mathit{s317}\xrightarrow{\mathit{?PRINT\_EXIST}, \mathit{true}, \{\}}\mathit{s318},$ \\
& & $\mathit{s318}\xrightarrow{\mathit{!502}, \mathit{true}, \{\}}\mathit{s321},\mathit{s318}\xrightarrow{\mathit{!503}, \mathit{true}, \{\}}\mathit{s322},\mathit{s318}\xrightarrow{\mathit{!260}, \mathit{true}, \{\}}\mathit{s319},$ \\
Expand Down Expand Up @@ -290,12 +272,6 @@
& & $\mathit{s414}\xrightarrow{\mathit{\tau}, \mathit{true}, \{\}}\mathit{s415},\mathit{s415}\xrightarrow{\mathit{\tau}, \mathit{true}, \{\}}\mathit{s532},\mathit{s416}\xrightarrow{\mathit{!503}, \mathit{true}, \{\}}\mathit{s420},$ \\
\end{tabular}

\begin{tabular}{lcp{350px}}
\end{tabular}

\begin{tabular}{lcp{350px}}
\end{tabular}

\begin{tabular}{lcp{350px}}
& & $\mathit{s416}\xrightarrow{\mathit{!502}, \mathit{true}, \{\}}\mathit{s419},\mathit{s416}\xrightarrow{\mathit{!201}, \mathit{true}, \{\}}\mathit{s417},\mathit{s416}\xrightarrow{\mathit{!503}, \mathit{true}, \{\}}\mathit{s418},$ \\
& & $\mathit{s417}\xrightarrow{\mathit{\tau}, \mathit{true}, \{\}}\mathit{s426},\mathit{s418}\xrightarrow{\mathit{\tau}, \mathit{true}, \{\}}\mathit{s426},\mathit{s419}\xrightarrow{\mathit{\tau}, \mathit{true}, \{\}}\mathit{s425},$ \\
Expand Down Expand Up @@ -337,9 +313,6 @@
& & $\mathit{s468}\xrightarrow{\mathit{!210}, \mathit{(cr\_variable = ``CS\_EVENT") \land (cr\_value = ``EV\_NONE")}, \{\}}\mathit{s470},$ \\
\end{tabular}

\begin{tabular}{lcp{350px}}
\end{tabular}

\begin{tabular}{lcp{350px}}
& & $\mathit{s468}\xrightarrow{\mathit{!210}, \mathit{(cr\_variable = ``CS\_EVENT") \land (cr\_value = ``EV\_INFO")}, \{\}}\mathit{s469},$ \\
& & $\mathit{s469}\xrightarrow{\mathit{\tau}, \mathit{true}, \{\}}\mathit{s471},\mathit{s47}\xrightarrow{\mathit{?IDLE}, \mathit{true}, \{\}}\mathit{s48},\mathit{s470}\xrightarrow{\mathit{\tau}, \mathit{true}, \{\}}\mathit{s471},$ \\
Expand Down Expand Up @@ -381,9 +354,6 @@
& & $\mathit{s51}\xrightarrow{\mathit{?GET}, \mathit{(var\_name = ``CS\_EVENT")}, \{\}}\mathit{s52},$ \\
\end{tabular}

\begin{tabular}{lcp{350px}}
\end{tabular}

\begin{tabular}{lcp{350px}}
& & $\mathit{s510}\xrightarrow{\mathit{\tau}, \mathit{true}, \{\}}\mathit{s516},$ \\
& & $\mathit{s511}\xrightarrow{\mathit{?GET}, \mathit{(var\_name = ``CS\_EVENT")}, \{\}}\mathit{s512},$ \\
Expand Down Expand Up @@ -425,9 +395,6 @@
& & $\mathit{s559}\xrightarrow{\mathit{\tau}, \mathit{true}, \{\}}\mathit{s561},\mathit{s56}\xrightarrow{\mathit{\tau}, \mathit{true}, \{\}}\mathit{s57},\mathit{s560}\xrightarrow{\mathit{\tau}, \mathit{true}, \{\}}\mathit{s561},$ \\
\end{tabular}

\begin{tabular}{lcp{350px}}
\end{tabular}

\begin{tabular}{lcp{350px}}
& & $\mathit{s561}\xrightarrow{\mathit{\tau}, \mathit{true}, \{\}}\mathit{s562},\mathit{s562}\xrightarrow{\mathit{\tau}, \mathit{true}, \{\}}\mathit{s563},$ \\
& & $\mathit{s563}\xrightarrow{\mathit{?GET}, \mathit{(var\_name = ``CERTDATA")}, \{\}}\mathit{s564},$ \\
Expand Down Expand Up @@ -510,9 +477,6 @@
& & $\mathit{s647}\xrightarrow{\mathit{!210}, \mathit{(cr\_variable = ``CS\_EVENT") \land (cr\_value = ``EV\_WARN")}, \{\}}\mathit{s650},$ \\
\end{tabular}

\begin{tabular}{lcp{350px}}
\end{tabular}

\begin{tabular}{lcp{350px}}
& & $\mathit{s647}\xrightarrow{\mathit{!210}, \mathit{(cr\_variable = ``CS\_EVENT") \land (cr\_value = ``EV\_ERROR")}, \{\}}\mathit{s651},$ \\
& & $\mathit{s647}\xrightarrow{\mathit{!210}, \mathit{(cr\_variable = ``CS\_EVENT") \land (cr\_value = ``EV\_NONE")}, \{\}}\mathit{s648},$ \\
Expand Down Expand Up @@ -554,15 +518,6 @@
& & $\mathit{s687}\xrightarrow{\mathit{!210}, \mathit{(cr\_variable = ``CS\_EVENT") \land (cr\_value = ``EV\_INFO")}, \{\}}\mathit{s689},$ \\
\end{tabular}

\begin{tabular}{lcp{350px}}
\end{tabular}

\begin{tabular}{lcp{350px}}
\end{tabular}

\begin{tabular}{lcp{350px}}
\end{tabular}

\begin{tabular}{lcp{350px}}
& & $\mathit{s688}\xrightarrow{\mathit{\tau}, \mathit{true}, \{\}}\mathit{s692},\mathit{s689}\xrightarrow{\mathit{\tau}, \mathit{true}, \{\}}\mathit{s692},\mathit{s69}\xrightarrow{\mathit{?IDLE}, \mathit{true}, \{\}}\mathit{s70},$ \\
& & $\mathit{s690}\xrightarrow{\mathit{\tau}, \mathit{true}, \{\}}\mathit{s692},\mathit{s691}\xrightarrow{\mathit{\tau}, \mathit{true}, \{\}}\mathit{s692},\mathit{s692}\xrightarrow{\mathit{\tau}, \mathit{true}, \{\}}\mathit{s707},$ \\
Expand Down Expand Up @@ -768,12 +723,6 @@
& & $\mathit{assending}\xrightarrow{\mathit{?GET}, \mathit{(var\_name = ``CS\_SIGN")}, \{\}}\mathit{s760},$ \\
\end{tabular}

\begin{tabular}{lcp{350px}}
\end{tabular}

\begin{tabular}{lcp{350px}}
\end{tabular}

\begin{tabular}{lcp{350px}}
& & $\mathit{assidle}\xrightarrow{\mathit{?RESUME}, \mathit{true}, \{\}}\mathit{s252},\mathit{assidle}\xrightarrow{\mathit{\tau}, \mathit{true}, \{\}}\mathit{s240},$ \\
& & $\mathit{assidle}\xrightarrow{\mathit{?GET}, \mathit{(var\_name = ``CS\_SIGN")}, \{\}}\mathit{s194},$ \\
Expand Down

0 comments on commit cc61f98

Please sign in to comment.