change finals to use gpsr

documents/scoresheets.tex

@@ -149,16 +149,10 @@
 
 % %%% FINALS   %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-% Final (Jury)
-\renewcommand{\currentTest}{Final Demonstration --- Jury Evaluation}
+% Final 
+\renewcommand{\currentTest}{Final Demonstration}
 \begin{scoresheet}
-\input{scoresheets/FinalsJury.tex}
-\end{scoresheet}
-
-% Final (EC)
-\renewcommand{\currentTest}{Final Demonstration --- Executive Committee}
-\begin{scoresheet}
-\input{scoresheets/FinalsExec.tex}
+\input{scoresheets/Finals.tex}
 \end{scoresheet}
 
 \end{document}

pages/general_rules/Procedure.tex

@@ -17,7 +17,6 @@ \subsection{Maximum number of team members}
 	\item \textbf{Setup:} During the setup of a test, the number of team members inside the \Arena{} is not limited.
 	% \item \textbf{Open Demonstrations:} During the \iterm{Open Challenge} \iterm{Demo Challenge}, and the \iaterm{final demonstration}{Finals}, the number of team members inside the arena is not limited.
 	%\item \textbf{Open Demonstrations:} During the \iterm{Open Challenge}, and the \iaterm{final demonstration}{Finals}, the number of team members inside the arena is not limited.
-	\item \textbf{\FINAL:} During the \FINAL, the number of team members inside the \Arena{} is not limited.
 \end{enumerate}
 
 \subsection{Fair play}

pages/organization/Setup.tex

@@ -20,17 +20,16 @@ \chapter{Setup and Preparation}
       %Second row
       \multicolumn{1}{S|}{} &
       \multicolumn{2}{M|}{$\xrightarrow{advance}$\newline All teams that \newline passed Inspection} &
-      \multicolumn{2}{M|}{$\xrightarrow{advance}$\newline Best 10 ($<6$) \newline or best 50\% ($\geq 12$)} &
-      \multicolumn{2}{M|}{$\xrightarrow{advance}$\newline Best 2 \newline teams} &
+      \multicolumn{2}{M|}{$\xrightarrow{advance}$\newline Best 6 ($<12$) \newline or best 50\% ($\geq 12$)} &
+      \multicolumn{2}{M|}{$\xrightarrow{advance}$\newline Best 3 \newline teams} &
       \multicolumn{1}{C{1.2cm}}{~}
       \\ \cline{2-7}
     \end{tabularx}
   \end{center}
 \end{table}
 
 
-\section{General Setup}
-\label{sec:general_setup}
+\section{General Setup}\label{sec:general_setup}
 Depending on the schedule, the \iterm{Setup \& Preparation} phase lasts for one or two days.
 
 \begin{enumerate}

pages/rulebook/about.tex

@@ -13,10 +13,8 @@ \section*{About this rulebook}
 \section*{How to cite this rulebook}
 If you refer to RoboCup@Home and this rulebook in particular, please cite:\\
 
-\noindent Justin Hart, Alexander Moriarty, Katarzyna Pasternak, Johannes Kummert,
-Alina Hawkin, Vanessa Hassouna, Juan Diego Pena Narvaez, Leroy Ruegemer,
-Leander von Seelstrang, Peter Van Dooren, Juan Jose Garcia, Akinobu Mitzutani,
-Yuqian Jiang, Tatsuya Matsushima, Riccardo Polvara
+\noindent Justin Hart, Alexander Moriarty, Katarzyna Pasternak, Johannes Kummert, Matteo Leonetti, Luis Contreras,
+Alina Hawkin, Vanessa Hassouna, Leroy Ruegemer, Akinobu Mitzutani, Tiago Ribeiro
 \enquote{Robocup@Home \YEAR: Rule and regulations,}
 \url{https://github.com/RoboCupAtHome/RuleBook/releases/download/2024.1/rulebook.pdf}, \YEAR.
 

scoresheets/Finals.tex

@@ -0,0 +1,31 @@
+\begin{scorelist}[timelimit=10,attempts=1,outstanding=False,continue=False, specialpenbonus=False]
+	\scoreheading{Main Goal (can be repeated unlimited times)}
+	\scoreitem[3]{150}{Find and clearly state an encountered EGPSR problem}
+	\scoreitem[3]{650}{Solve a EGPSR problem}
+	\scoreitem[1]{600}{Opening the Door of the Apartment}
+	\scoreitem[1]{600}{Closing the Dishwasher}
+	\scoreitem[1]{300}{Closing a Cabinet Door}
+
+	\scoreheading{Penalties}
+	\penaltyitem[1]{100}{Find repeated EGPSR problem category}
+	\penaltyitem[1]{300}{Solving repeated EGPSR problem category for the 2nd time}
+	\penaltyitem[1]{500}{Solving repeated EGPSR problem category for the 3rd (or more) time}
+
+	\scoreheading{Deus Ex Machina Penalties}
+	\penaltyitem[3]{150}{Asking for location of a problem}
+	\penaltyitem[3]{650}{
+		Instructing a human to perform parts of the task will apply a \\
+		percentage penalty according to similar penalties in other \\
+		Stage II tests.
+		}
+
+\end{scorelist}
+
+\ifShortScoresheet{}{
+	\textbf{Referee Information:}
+	Note each problem (category, item, location) and mark if they are stated by the robot in remarks
+}%
+
+% Local Variables:
+% TeX-master: "../rulebook"
+% End:

tasks/EGPSR.tex

@@ -43,7 +43,7 @@ \subsection*{Additional rules and remarks}
 	\item \textbf{Repeating Problem Category:} Solving the same Category of Problem incurs a penalty. 
 	\item \textbf{Solving more:} You can continue solving problems to compensate for penalties.
 	\item \textbf{Partial Scoring:} The main task allows partial scoring (per \emph{solved} problem).
-	\item \textbf{Command Generator:} Problems and commands will be generated using the official command generator\footnote{\url{https://github.com/johaq/CommandGenerator}}.
+	\item \textbf{Command Generator:} Problems and commands will be generated using the official command generator\footnote{\url{https://github.com/RoboCupAtHome/CommandGenerator}}.
 	\item \textbf{Finding People:} Finding a person and stating they need help counts as finding the problem.
 	\item \textbf{Understanding Commands:} Understanding and correctly repeating the command given by a person can be counted towards partially solving a problem.
 \end{enumerate}

tasks/Finals.tex

@@ -1,88 +1,40 @@
 \chapter{Finals}
 
 The competition ends with the Finals on the last day, where the two teams with the highest total score compete.
-The \iterm{Finals} are conducted as a final themed demonstration.
-
-%To avoid logistical issues during the last day of the competition, the \iterm{Finals} are divided into two sets of demonstrations: the Bronze Competition and the RoboCup @Home Grand Finale.
-%The Bronze Competition is a set of demonstrations that are carried out before the RoboCup @home Grand Finale. Here, all the leagues run in parallel, with the fourth and third highest scored teams competing for the bronze.
-%Finally, the two teams with the highest score in each League present their demonstrations in a serialized manner during the RoboCup @Home Grand Finale.
 
 Even though each league has its own first, second and third place, the \iterm{Finals} are meant to show the best of all leagues to the jury members as well as the audience and, thus, warrants a single schedule slot.
 
-\section{Structure and Theme}
-
-The \iterm{Finals} are a demonstration of achieving an objective that is pre-selected by the TC/EC. These objectives are chosen as a type of yearly theme of the competition, and to provide a baseline for the juries (not to mention the audience) to state which team is the winner.
-
-The objectives for each league for this year are:
-
-\begin{itemize}
-    \item The robot helps a person in preparing dinner.
-\end{itemize}
-
-
-The teams are expected to provide a demonstration that is telling a story which includes achieving the objective. The teams can choose freely how to achieve it, which includes choosing the participants, what items to use, the methods employed, etc. The juries, as explained later, will reward elegance and difficulty.
-
-As it can be seen, the objectives are open enough that a story can be told around them which can include additional objectives that the team wants their robot to also solve. Thus, the teams are welcome to include in their demonstration any additional tasks to be solved, which can serve as a type of forum where they can present their own research. The innovation and success of these tasks will also be used as part of the score (as it is described later). In this regard, it is expected that teams present the scientific and technical contributions they submitted in both \iterm{team description paper} and the \iterm{RoboCup\char64Home Wiki}.
-
-In addition, teams may provide a printed document to the jury (max 1 page) that summarizes the demonstrated robot capabilities and contributions. However, teams are discouraged to provide any material that would distract from their demonstration.
-
-Story-telling is an important factor, so it is recommended to spend the least amount of time using the microphone to explain the demonstration and let the demonstration speak for itself.
-
-
-\section{Evaluating Juries for Final Demonstrations}
-The \iterm{Finals} are evaluated by two juries, here described.
-
-\begin{enumerate}
-\item\textbf{League-internal jury:} The league-internal jury is formed by the Executive Committee. The evaluation of the league-internal jury is based on the following criteria:
-  \begin{compactenum}
-  \item Efficacy/elegance of the solution
-  \item Innovation/contribution to the league of the additional tasks solved
-  \item Difficulty of the overall demonstration
-  \end{compactenum}
-
-\item \textbf{League-external jury:} The league-external jury consists of people not being involved in the RoboCup@Home league, but having a related background (not necessarily robotics). They are appointed by the Executive Committee. The evaluation of the league-external jury is based on the following criteria:
-  \begin{compactenum}
-  \item Originality and presentation (story-telling is to be rewarded)
-  \item Relevance/usefulness to everyday life
-  \item Elegance/success of overall demonstration
-  \end{compactenum}
-\end{enumerate}
-
 \section{Scoring}
 The final score and ranking are determined by the jury evaluations and by the previous performance (in Stages I and II) of the team, in the following manner:
 
 \begin{enumerate}
-  \item The influence of the league-internal jury to the final ranking is \SI{25}{\percent}.
-  \item The influence of the league-external jury to the final ranking is \SI{25}{\percent}.
+  \item The influence of the final ranking is \SI{50}{\percent}.
   \item The influence of the total sum of points scored by the team in Stage I and II is \SI{50}{\percent}.
 \end{enumerate}
 
-These demonstrations are carried out in a serialized fashion, one League performing after another in one \Arena{}.
+There is no maximum score during the Final.
 
+These demonstrations are carried out in a serialized fashion, one League performing after another in one \Arena{}.
 
 \subsection{Task}
-The procedure for the demonstration and the timing of slots is as follows:
-\OpenDemonstrationTask{ten}{five}
+The procedure for the demonstration is the same as for Enhanced General Purpose Service Robot (see~Task~\ref{test:egpsr}) with the added tasks of:
+
+\begin{enumerate}[nosep]
+\item \textbf{Closing Furniture:} Doors of the Cabinet as well as the Dishwasher need to be closed.
+\item \textbf{Welcome Guest:} There is an additional Person waiting behind the Exit door.
+\end{enumerate}
 
-\OpenDemonstrationChanges
+\subsection*{Score sheet}
+\input{scoresheets/Finals.tex}
 
 %% %%%%%%%%%%%%%%%%%%%%%%%%
 \section{Final Ranking and Winner}
 
-There will be an award for 1st, 2nd and 3rd place of each league.
-
 The winner of the competition is the team that gets the highest ranking in the \iterm{Finals}.
 
 The second place will be the team that got the second-highest ranking in the \iterm{Finals}.
 
-The third place will be the team with the highest score that did not made it to the \iterm{Finals}.
-
-Additional certificates would be granted if:
-
-\begin{enumerate}
-  \item If the number of teams in the league is above 11, a certificate will be awarded to the 4th ranked team.
-  \item If the number of teams in the league is above 14, a certificate will be awarded to the 5th ranked team.
-\end{enumerate}
+The third place will be the team with the lowest score in the \iterm{Finals}.
 
 
 % Local Variables:

tasks/GPSR.tex

@@ -53,7 +53,7 @@ \subsection*{Additional Rules and Remarks}
 \begin{enumerate}[nosep]
 	\item \textbf{Partial scoring:} The main task allows partial scoring (per \emph{completed} command).
 
-	\item \textbf{Command generator:} Tasks will be generated using the official command generator\footnote{\url{https://github.com/johaq/CommandGenerator}}.
+	\item \textbf{Command generator:} Tasks will be generated using the official command generator\footnote{\url{https://github.com/RoboCupAtHome/CommandGenerator}}.
 
 	\item \textbf{Non-expert operators:} Referees are not allowed to instruct non-expert operators on how to operate the robot.
 	Teams attempting to instruct or bias the operator will be disqualified from the task.

tasks/old/ThemedFinals.tex

@@ -0,0 +1,90 @@
+\chapter{Finals}
+
+The competition ends with the Finals on the last day, where the two teams with the highest total score compete.
+The \iterm{Finals} are conducted as a final themed demonstration.
+
+%To avoid logistical issues during the last day of the competition, the \iterm{Finals} are divided into two sets of demonstrations: the Bronze Competition and the RoboCup @Home Grand Finale.
+%The Bronze Competition is a set of demonstrations that are carried out before the RoboCup @home Grand Finale. Here, all the leagues run in parallel, with the fourth and third highest scored teams competing for the bronze.
+%Finally, the two teams with the highest score in each League present their demonstrations in a serialized manner during the RoboCup @Home Grand Finale.
+
+Even though each league has its own first, second and third place, the \iterm{Finals} are meant to show the best of all leagues to the jury members as well as the audience and, thus, warrants a single schedule slot.
+
+\section{Structure and Theme}
+
+The \iterm{Finals} are a demonstration of achieving an objective that is pre-selected by the TC/EC. These objectives are chosen as a type of yearly theme of the competition, and to provide a baseline for the juries (not to mention the audience) to state which team is the winner.
+
+The objectives for each league for this year are:
+
+\begin{itemize}
+    \item The robot helps a person in preparing dinner.
+\end{itemize}
+
+
+The teams are expected to provide a demonstration that is telling a story which includes achieving the objective. The teams can choose freely how to achieve it, which includes choosing the participants, what items to use, the methods employed, etc. The juries, as explained later, will reward elegance and difficulty.
+
+As it can be seen, the objectives are open enough that a story can be told around them which can include additional objectives that the team wants their robot to also solve. Thus, the teams are welcome to include in their demonstration any additional tasks to be solved, which can serve as a type of forum where they can present their own research. The innovation and success of these tasks will also be used as part of the score (as it is described later). In this regard, it is expected that teams present the scientific and technical contributions they submitted in both \iterm{team description paper} and the \iterm{RoboCup\char64Home Wiki}.
+
+In addition, teams may provide a printed document to the jury (max 1 page) that summarizes the demonstrated robot capabilities and contributions. However, teams are discouraged to provide any material that would distract from their demonstration.
+
+Story-telling is an important factor, so it is recommended to spend the least amount of time using the microphone to explain the demonstration and let the demonstration speak for itself.
+
+
+\section{Evaluating Juries for Final Demonstrations}
+The \iterm{Finals} are evaluated by two juries, here described.
+
+\begin{enumerate}
+\item\textbf{League-internal jury:} The league-internal jury is formed by the Executive Committee. The evaluation of the league-internal jury is based on the following criteria:
+  \begin{compactenum}
+  \item Efficacy/elegance of the solution
+  \item Innovation/contribution to the league of the additional tasks solved
+  \item Difficulty of the overall demonstration
+  \end{compactenum}
+
+\item \textbf{League-external jury:} The league-external jury consists of people not being involved in the RoboCup@Home league, but having a related background (not necessarily robotics). They are appointed by the Executive Committee. The evaluation of the league-external jury is based on the following criteria:
+  \begin{compactenum}
+  \item Originality and presentation (story-telling is to be rewarded)
+  \item Relevance/usefulness to everyday life
+  \item Elegance/success of overall demonstration
+  \end{compactenum}
+\end{enumerate}
+
+\section{Scoring}
+The final score and ranking are determined by the jury evaluations and by the previous performance (in Stages I and II) of the team, in the following manner:
+
+\begin{enumerate}
+  \item The influence of the league-internal jury to the final ranking is \SI{25}{\percent}.
+  \item The influence of the league-external jury to the final ranking is \SI{25}{\percent}.
+  \item The influence of the total sum of points scored by the team in Stage I and II is \SI{50}{\percent}.
+\end{enumerate}
+
+These demonstrations are carried out in a serialized fashion, one League performing after another in one \Arena{}.
+
+
+\subsection{Task}
+The procedure for the demonstration and the timing of slots is as follows:
+\OpenDemonstrationTask{ten}{five}
+
+\OpenDemonstrationChanges
+
+%% %%%%%%%%%%%%%%%%%%%%%%%%
+\section{Final Ranking and Winner}
+
+There will be an award for 1st, 2nd and 3rd place of each league.
+
+The winner of the competition is the team that gets the highest ranking in the \iterm{Finals}.
+
+The second place will be the team that got the second-highest ranking in the \iterm{Finals}.
+
+The third place will be the team with the highest score that did not made it to the \iterm{Finals}.
+
+Additional certificates would be granted if:
+
+\begin{enumerate}
+  \item If the number of teams in the league is above 11, a certificate will be awarded to the 4th ranked team.
+  \item If the number of teams in the league is above 14, a certificate will be awarded to the 5th ranked team.
+\end{enumerate}
+
+
+% Local Variables:
+% TeX-master: "Rulebook"
+% End: