update voor tabel

diff --git a/a2/1cases.tex b/a2/1cases.tex
index 6eaa380..40bd1b9 100644 (file)
--- a/a2/1cases.tex
+++ b/a2/1cases.tex
@@ -9,7 +9,7 @@ user permissions.
 
 \begin{longtabu}{|l|X|}
        \hline
-       Check 1 & Get the SUT in a workable state. \\
+       Check 1 & Get the SUT in a workable state.\\
        \hline
        Course of action &
                \begin{enumerate}
@@ -71,7 +71,8 @@ user permissions.
                \begin{enumerate}
                        \item Boot the SUT as in \emph{Check 1}.
                        \item Execute the command \texttt{ls scripts/tests}
-                       \item Verify that there is a file named case$X$ for each test case $X$
+                       \item Verify that there is a file named case$X$ for each test case
+                               $X$
                        \item Use \emph{ls packets}
                        \item Verify that there is a file named \texttt{single.pcap} and
                        \texttt{multi.pcap}.
@@ -108,16 +109,33 @@ these partitions are given.
                        \item n=small payload packets
                        \item n=big payload packets
                \end{enumerate}
-       \item Correct or incorrect \emph{source port}
-       \item Correct or incorrect \emph{destination port}
+       \item \emph{source port}
+               \begin{enumerate}
+                       \item Correct
+                       \item Incorrect
+               \end{enumerate}
+       \item \emph{destination port}
+               \begin{enumerate}
+                       \item Correct
+                       \item Incorrect
+               \end{enumerate}
        \item Bits flipped in \emph{payload}
                \begin{enumerate}
                        \item Correct payload
                        \item Payload with even number of bits flipped
                        \item Payload with odd number of bits flipped
                \end{enumerate}
-       \item Correct or Incorrect \emph{checksum}
-       \item Packets received in or out of order, or missing packets
+       \item \emph{checksum}
+               \begin{enumerate}
+                       \item Correct
+                       \item Incorrect
+               \end{enumerate}
+       \item Packet order
+               \begin{enumerate}
+                       \item Correct
+                       \item Out of order
+                       \item Missing packets
+               \end{enumerate}
 \end{enumerate}
 
 \textbf{hier iets over waarom deze partities relevant zijn! Waarom odd en 
@@ -130,20 +148,26 @@ to do so) tested with the different request sizes of partition 1.
 
 This is expressed in Table~\ref{table:testpairs}.
 
-\begin{table}
-% DIT MAAK IK NOG EVEN MOOI
-       \begin{tabularx}{\linewidth}{p{2cm} | l | p{2cm} | l | p{1cm} || c | c | p{1.3cm} | p{1.3cm}}
-       \textbf{Payload}      & \textbf{checksum}  & \textbf{destination port} & \textbf{order}         & \textbf{source port} & \textbf{payload 0} & \textbf{payload 1} & \textbf{payload small} & \textbf{payload big} \\  \hline \hline
-       Correct               & Correct   & Correct          & In order       & Correct     & \checkmark & \checkmark & \checkmark & \checkmark \\  \hline
-       Correct               & Incorrect & Incorrect        & Missing packet & Incorrect   & \xmark & \xmark & \checkmark & \checkmark \\  \hline
-       odd\# of bits flipped  & Correct   & Incorrect        & Out of order   & Incorrect   & \xmark & \xmark & \checkmark & \checkmark \\  \hline
-       odd\# of bits flipped  & Incorrect & Correct          & Missing packet & Correct     & \xmark & \xmark & \checkmark & \checkmark \\  \hline
-       even\# of bits flipped & Correct   & Incorrect        & Missing packet & Correct     & \xmark & \xmark & \checkmark & \checkmark \\  \hline
-       even\# of bits flipped & Incorrect & Correct          & Out of order   & Incorrect   & \xmark & \xmark & \checkmark & \checkmark \\  \hline
-       odd\# of bits flipped  & Incorrect & Incorrect        & In order       & Incorrect   & \checkmark & \checkmark & \checkmark & \checkmark \\  \hline
-       even\# of bits flipped & Incorrect & Incorrect        & In order       & Incorrect   & \checkmark & \checkmark & \checkmark & \checkmark \\  \hline
-       Correct               & Incorrect & Incorrect        & Out of order   & Correct     & \xmark & \xmark & \checkmark & \checkmark \\  
-\end{tabularx}
+\begin{table}[H]
+       \centering
+       \begin{tabular}{|l|l|l|l|l|l|l|l|l|l|l|}
+               \hline
+               & \multicolumn{10}{c|}{\textbf{Partition}}\\
+               \hline
+               & \# & 4 & 5 & 3 & 6 & 2 & 1a & 1b & 1c & 1d\\
+               \hline\hline
+               \multirow{9}{*}{Instance} 
+               & 1 & a & a & a & a & a & \checkmark & \checkmark & \checkmark & \checkmark\\
+               & 2 & a & b & b & c & b & \xmark & \xmark & \checkmark & \checkmark\\
+               & 3 & c & a & b & a & b & \xmark & \xmark & \checkmark & \checkmark\\
+               & 4 & c & b & a & c & a & \xmark & \xmark & \checkmark & \checkmark\\
+               & 5 & b & a & b & c & a & \xmark & \xmark & \checkmark & \checkmark\\
+               & 6 & b & b & a & b & b & \xmark & \xmark & \checkmark & \checkmark\\
+               & 7 & c & b & b & a & b & \checkmark & \checkmark & \checkmark & \checkmark\\
+               & 8 & b & b & b & a & b & \checkmark & \checkmark & \checkmark & \checkmark\\
+               & 9 & a & b & b & b & a & \xmark & \xmark & \checkmark & \checkmark\\
+               \hline
+\end{tabular}
 \caption{Combinations of test cases}
 \label{table:testpairs}
 \end{table}

diff --git a/a2/preamble.tex b/a2/preamble.tex
index a71cf23..4afe3a3 100644 (file)
--- a/a2/preamble.tex
+++ b/a2/preamble.tex
@@ -4,6 +4,7 @@
 \usepackage[dvipdfm]{hyperref}
 \usepackage{listings}
 \usepackage{graphicx}
+\usepackage{multirow}
 \usepackage{float}
 \usepackage{tabu}
 \usepackage{tabularx}