Merge pull request #915 from RoboCupAtHome/leroy/timelimits

Add task duration to scoresheets

scoresheets/CleanTable.tex

@@ -1,6 +1,4 @@
-The maximum time for this test is 10 minutes.
-
-\begin{scorelist}
+\begin{scorelist}[timelimit=10]
 	\scoreheading{Main Goal}
 	\scoreitem{15}{Navigate to the table to pick up items}
 	\scoreitem[2]{40}{Picking tableware (cup, bowl) for transportation to the dishwasher}

scoresheets/EGPSR.tex

@@ -1,6 +1,4 @@
-The maximum time for this test is 10 minutes.
-
-\begin{scorelist}
+\begin{scorelist}[timelimit=10]
 	\scoreheading{Main Goal}
 	\scoreitem[3]{150}{Find and clearly state an encountered problem}
 	\scoreitem[3]{650}{Solve a problem}

scoresheets/GPSR.tex

@@ -1,6 +1,4 @@
-The maximum time for this test is 5 minutes.
-
-\begin{scorelist}
+\begin{scorelist}[timelimit=5]
 	\scoreheading{Main Goal}
 	\scoreitem[3]{400}{Executing the task associated with each command}
 

scoresheets/HelpMeCarry.tex

@@ -1,7 +1,4 @@
-
-The maximum time for this test is 5 minutes.
-
-\begin{scorelist}
+\begin{scorelist}[timelimit=5]
 	\scoreheading{Main Goal}
 	\scoreitem{300}{Following the person to the car}
 	\scoreitem{15}{Perceiving the correct beg (visualize on screen or say which one)}

scoresheets/Receptionist.tex

@@ -1,6 +1,4 @@
-The maximum time for this test is 5 minutes.
-
-\begin{scorelist}[startbutton=false]
+\begin{scorelist}[startbutton=false,timelimit=5]
 	\scoreheading{Main Goal}
 	\scoreitem[2]{15}{Guide the guest to the other guests (navigate to the guest group)}
 	\scoreitem[2]{50}{Look in the direction of navigation or at the navigation goal}

scoresheets/Restaurant.tex

@@ -1,10 +1,4 @@
-\begin{table}[h]
-	\begin{tabular}{m{0.85\linewidth} c}
-		\textbf{Maximum time}: & 15 minutes \\
-	\end{tabular}
-\end{table}
-
-\small\begin{scorelist}
+\small\begin{scorelist}[timelimit=15]
 	\scoreheading{Regular Rewards}	
 	\scoreitem[2]{100}{Detect calling or waving customer}
 	\scoreitem[2]{100}{Reach a customer's table without prior guidance/training}

scoresheets/ServeBreakfast.tex

@@ -1,6 +1,4 @@
-The maximum time for this test is 5 minutes.
-
-\begin{scorelist}
+\begin{scorelist}[timelimit=5]
 	\scoreheading{Main Goal}
 	\scoreitem{15}{Initial navigation to pick up area}
 	\scoreitem[4]{15}{Perceiving object and categorizing it correctly (visualize or say)}

scoresheets/SticklerForRules.tex

@@ -1,12 +1,4 @@
-
-\begin{table}[h]
-	\begin{tabular}{m{0.85\linewidth} c}
-		\textbf{Maximum time}: & 10 minutes \\
-	\end{tabular}
-\end{table}
-
-
-\begin{scorelist}
+\begin{scorelist}[timelimit=10]
 
 	\scoreheading{Regular Rewards}	
 	\scoreitem[4]{100}{Identify a guest breaking a house rule (indicating the rule by voice).}

scoresheets/StoringGroceries.tex

@@ -1,7 +1,4 @@
-
-The maximum time for this test is 5 minutes.
-
-\begin{scorelist}
+\begin{scorelist}[timelimit=5]
 	\scoreheading{Main Goal}
 	\scoreitem{15}{Navigating to the table}
 	\scoreitem[5]{15}{Perceiving object and categorizing it correctly}

setup/macros_scoresheets.tex

@@ -25,6 +25,9 @@
 % The global number of attempts per test
 \newcommand{\attempts}{3}
 
+% The Default Timelimit for the Test
+\newcommand{\timelimit}{5}
+
 % Sets the total penalty for not showing up
 \newcommand{\notattendingpenalty}{500}
 
@@ -104,6 +107,7 @@
 %                        arbitrary value (disables autocalc)
 %   - attempts           Integer. Number of attempts for the
 %                        scoresheet (default is \global\attempts)
+%   - timelimit          Integer. Timelimit in minutes
 %   - continue           Not implemented
 %   - datarecording      Boolean. Toggles the "Data Recording"
 %                        item under Special penalties and standard
@@ -145,55 +149,6 @@
 %                   description
 %   #3 description  A description for the score mark
 %
-%
-%
-%
-%
-%
-%
-%
-%
-%
-%
-%
-%
-%
-%
-%
-%
-%
-%
-%
-%
-%
-%
-%
-%
-%
-%
-%
-%
-%
-%
-%
-%
-%
-%
-%
-%
-%
-%
-%
-%
-%
-%
-%
-%
-%
-%
-%
-%
-%
 % %%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                                  %
 % FROM HERE ON, THERE IS NOTHING TO CHANGE                         %
@@ -275,6 +230,8 @@
 		\vspace{0pt}%
 		\includegraphics[width=\textwidth]{images/logo_RoboCupAtHome.jpg}%
 	\end{minipage}\\%
+
+
 }{
 % \end{scoresheet}
 	\vspace{0.5 em}%
@@ -322,6 +279,7 @@
 	/scorelist/.is family, /scorelist,
 	default/.style={
 		attempts = \attempts,
+		timelimit = \timelimit,
 		continue = true,
 		datarecording = \dataRecordingBonus,
 		datarecordingpc = \dataRecordingBonusPercentage,
@@ -338,6 +296,7 @@
 		secondtrycc = \secondTryColumnCaption,
 	},
 	attempts/.estore in = \scorelistAttempts,
+	timelimit/.estore in = \scorelistTimelimit,
 	continue/.estore in = \scorelistContinue,
 	datarecording/.estore in = \scorelistDataRecording,
 	datarecordingpc/.estore in = \scorelistDataRecordingPercentage,
@@ -362,6 +321,12 @@
 	%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 	\pgfkeys{/scorelist, default, #1}%
 
+	\ifShortScoresheet{
+		The maximum time for this test is \textbf{\scorelistTimelimit{}:00} minutes.
+	}{%
+
+	}
+
 	%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 	% init variables %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 	%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -580,6 +545,16 @@
 		\bonusitem{\thecurrOutstandingBonus}{Outstanding performance~\ifShortScoresheet{(see sec.~\ref{rule:outstanding_performance})}{}}%
 	}{}%
 	%
+
+	%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+	% Other Items %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+	%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+	\ifShortScoresheet{}{%
+		\scoreheading{Recordings}
+		\scoreitem{0}{Duration (limit: \textbf{\scorelistTimelimit{}:00} minutes)}
+	}%
+
+
 	% Total score %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 	\\[-1em]\hline
 	\scorePerTry