1.1 --- a/thesis/input/requirements.tex	Sat Jan 10 22:27:06 2009 +0100
     1.2 +++ b/thesis/input/requirements.tex	Sun Jan 11 14:07:23 2009 +0100
     1.3 @@ -3,44 +3,25 @@
     1.4  	Requirement & Importance & Pending work & Focus \\
     1.5  	\hline \hline
     1.6  	\RF1: In/out channels    & ++ & - & + \\
     1.7 -	\hline
     1.8  	\RF2: Mail queue         & ++ & - & + \\
     1.9 -	\hline
    1.10  	\RF3: Header sanitizing  & 0 & - & - \\
    1.11 -	\hline
    1.12  	\RF4: Aliasing           & 0 & - & - \\
    1.13 -	\hline
    1.14  	\RF5: Route selection    & + & - & 0 \\
    1.15 -	\hline
    1.16  	\RF6: Authentication     & ++ & + & +++ \\
    1.17 -	\hline
    1.18  	\RF7: Encryption         & ++ & + & +++ \\
    1.19 -	\hline
    1.20  	\RF8: Spam prevention    & + & ++ & +++ \\
    1.21 -	\hline
    1.22  	\RF9: Malware handling   & - & + & 0 \\
    1.23 -	\hline
    1.24  	\RF10: Archiving         & - & + & 0 \\
    1.25  	\hline
    1.26 -	\hline
    1.27  	\RG1: Security           & ++ & + & +++ \\
    1.28 -	\hline
    1.29  	\RG2: Reliability        & ++ & + & +++ \\
    1.30 -	\hline
    1.31  	\RG3: Robustness         & + & + & ++ \\
    1.32 -	\hline
    1.33  	\RG4: Extendability      & + & ++ & +++ \\
    1.34 -	\hline
    1.35  	\RG5: Maintainability    & + & 0 & + \\
    1.36 -	\hline
    1.37  	\RG6: Testability        & 0 & 0 & 0 \\
    1.38 -	\hline
    1.39  	\RG7: Performance        & -{}- & - & -{}-{}- \\
    1.40 -	\hline
    1.41  	\RG8: Availability       & - & - & -{}- \\
    1.42 -	\hline
    1.43  	\RG9: Portability        & - & -{}- & -{}-{}- \\
    1.44 -	\hline
    1.45  	\RG10: Usability         & + & -{}- & - \\
    1.46  	\hline
    1.47  \end{tabular}

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/thesis/input/strategies.tex	Sun Jan 11 14:07:23 2009 +0100
     2.3 @@ -0,0 +1,38 @@
     2.4 +\begin{tabular}[Hbt]{| l | c || c | c | c |}
     2.5 +	\hline
     2.6 +	Requirement           & Focus & S1 & S2 & S3 \\
     2.7 +	\hline \hline
     2.8 +	\RF7: encryption        & +++ & x  &    &   \\
     2.9 +	\RF6: authentication    & +++ & x  &    &   \\
    2.10 +	\RG1: security          & +++ &    & x  & x \\
    2.11 +	\RG2: reliability       & +++ &    &    & x \\
    2.12 +	\RF8: spam handling     & +++ & x  & x  & x \\
    2.13 +	\RG4: extendability     & +++ &    &    & x \\
    2.14 +	\hline
    2.15 +	\RG3: robustness        & ++  &    &    & x \\
    2.16 +	\hline
    2.17 +	\RF1: in/out channels   & +   & x  & x  & x \\
    2.18 +	\RF2: mail queueing     & +   &    &    & x \\
    2.19 +	\RG5: maintainability   & +   &    &    & x \\
    2.20 +	\hline
    2.21 +	\RF5: route selection   & 0   & x  &    &   \\
    2.22 +	\RF9: malware handling  & 0   & x  & x  & x \\
    2.23 +	\RF10: archiving        & 0   & x  &    & x \\
    2.24 +	\RG6: testability       & 0   &    &    & x \\
    2.25 +	\hline
    2.26 +	\RF3: header sanitizing & -   & x  &    &   \\
    2.27 +	\RF4: aliasing          & -   & x  &    &   \\
    2.28 +	\RG10: usability        & -   & x  &    &   \\
    2.29 +	\hline
    2.30 +	\RG8: availability      & -{}- & x &    &   \\
    2.31 +	\hline
    2.32 +	\RG7: performance       & -{}-{}- & x &  &  \\
    2.33 +	\RG9: portability       & -{}-{}- & x &  &  \\
    2.34 +	\hline \hline
    2.35 +	Score (Sum of `+')      & 23  & 9  & 7  & 17 \\
    2.36 +	\hline
    2.37 +\end{tabular}
    2.38 +
    2.39 +
    2.40 +
    2.41 +