From: Mart Lubbers <mart@martlubbers.net>
Date: Tue, 1 Dec 2015 16:30:52 +0000 (+0100)
Subject: final proposal
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=c2b8e494394c2ce8cba2241b9959c57d24876e2e;p=des2015.git

final proposal
---

diff --git a/marsrover/document/dev.tex b/marsrover/document/dev.tex
index 121c214..82aa79a 100644
--- a/marsrover/document/dev.tex
+++ b/marsrover/document/dev.tex
@@ -3,7 +3,8 @@ The development plan is written following the spiral software development model
 in which all requirements are divided into small iterations. Each of the
 iterations will have an implementation phase, a testing phase, an analysis
 phase, and a design phase. Furthermore, each of the iterations will have goals
-and results. The iterations are listed in \autoref{tab:devit}
+and results. The iterations are listed in \autoref{tab:devit}.
+The deadline of the iterations are listed in \autoref{tab:deadli}.
 
 \begin{table}[h!]
 	\centering
@@ -46,18 +47,16 @@ and results. The iterations are listed in \autoref{tab:devit}
 	\end{tabu}
 	\caption{Spiral model iterations}\label{tab:devit}
 \end{table}
-
-The deadline of the iterations are listed in \autoref{tab:deadli}
-\begin{table}
-	\begin{tabu} to \linewidth{lX}
-		\hline
+\begin{table}[h!]
+	\begin{tabu} to \linewidth{ll}
+		\toprule
 		Deadline & Iterations\\
-		\hline
-		9 Dec 2015 & Iteration 1 - 6\\
-		16 Dec 2015 & Iteration 7 - 10\\
-		23 Dec 2015 & Iteration 11 - 13\\
-		6 Jan 2016 & Iteration 14 - 16\\
-		\hline
+		\midrule
+		9 Dec 2015 & Iteration 1--6\\
+		16 Dec 2015 & Iteration 7--10\\
+		23 Dec 2015 & Iteration 11--13\\
+		6 Jan 2016 & Iteration 14--16\\
+		\bottomrule
 	\end{tabu}
 	\caption{Deadlines}\label{tab:deadli}
-\end{table}
\ No newline at end of file
+\end{table}
diff --git a/marsrover/document/preamble.tex b/marsrover/document/preamble.tex
index daa7985..4942b2e 100644
--- a/marsrover/document/preamble.tex
+++ b/marsrover/document/preamble.tex
@@ -3,11 +3,11 @@
 \usepackage[dvipdfm]{hyperref} % For a clickable toc and nice autorefs
 \usepackage{a4wide} % For not wasting space on a4
 \usepackage{booktabs} % For nicer looking tables
+\usepackage{enumitem} % For nice enumeration types
 \usepackage{fancyhdr} % For the fancy header with our names
 \usepackage{longtable} % For page spanning tables
 \usepackage{multirow} % For multirow tables
 \usepackage{tabu} % For nicer automatic spanning tables
-\usepackage{enumitem} % For nice enumeration types
 
 \title{MarsRover proposal}
 \author{Natanael Adityasatria (s4417992)\and Mart Lubbers (s4109503)}
diff --git a/marsrover/document/req.tex b/marsrover/document/req.tex
index 5b085df..e3409be 100644
--- a/marsrover/document/req.tex
+++ b/marsrover/document/req.tex
@@ -13,21 +13,30 @@
 
 	\multicolumn{3}{l}{Functional requirements}\\
 	\midrule\midrule
-	CR1 & Do not fall of the planet.\\
-	MR1 & Find and identify lakes by the color.\\
-	MR2 & Find rocks.\\
-	MR3 & Avoid rocks.\\
-	MR4 & Measure rocks and lakes.\\
-	MR5 & Push away rocks.\\
-	MR6 & Be able to perform multiple missions in sequence.\\
-	MR7 & Park robot in a garage.\\
-	MR8 & Remember where the lakes are after the robot found them.\\
-	ER1 & SLAM\footnote{Simultaneous localization and mapping} and be able to
-		navigate with the map.\\
-	ER2 & Sounds playing to notify the viewers.\\
+	CR1 & \textsc{M} & Do not fall of te planet.\\
+	MR1 & \textsc{M} & Find and identify lakes by the color.\\
+	MR2 & \textsc{M} & Find rocks.\\
+	MR3 & \textsc{M} & Avoid rocks.\\
+	MR4 & \textsc{M} & Measure rocks and lakes.\\
+	MR5 & \textsc{M} & Push away rocks.\\
+	MR6 & \textsc{M} & Be able to perform multiple missions in sequence.\\
+	MR7 & \textsc{S} & Park robot in a garage.\\
+	MR8 & \textsc{S} & Remember where the lakes are after the robot found
+		them.\\
+	ER1 & \textsc{C} & SLAM\footnote{Simultaneous localization and mapping}
+		and be able to navigate with the map.\\
+	ER2 & \textsc{C} & Sounds playing to notify the viewers.\\
+	ER3 & \textsc{C} & Display diagnostic information on the screen at all
+		times.\\
 	\midrule
 
 	\multicolumn{3}{l}{Non-functional requirements}\\
-	ER2 & Sounds playing to notify the viewers.\\
+	NR1 & \textsc{M} & The code should be generated by a DSL.\\
+	NR2 & \textsc{S} & Finish the entire mission set within the
+		demonstration time.\\
+	NR3 & \textsc{S} & Be able to function in lesser light.\\
+	NR4 & \textsc{S} & Be able to cope with lesser sensor data.\\
+	NR5 & \textsc{C} & If due bugs the sensors do not boot up the robot
+		should restart the program.\\
 	\midrule\midrule
 \end{longtabu}