Merge branch 'master' into egpsr

.gitignore

@@ -1,4 +1,5 @@
 .build
+.vscode
 
 *.aux
 *.glo

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Changelog
 
-[Current Draft]: https://github.com/RoboCupAtHome/RuleBook/compare/2023.2..HEAD
+[Current Draft]: https://github.com/RoboCupAtHome/RuleBook/compare/2024.2..HEAD
+[2024.2]: https://github.com/RoboCupAtHome/RuleBook/compare/2024.1..2024.2
 [2024.1]: https://github.com/RoboCupAtHome/RuleBook/compare/2023.2..2024.1
 [2023.2]: https://github.com/RoboCupAtHome/RuleBook/compare/2023.1..2023.2
 [2023.1]: https://github.com/RoboCupAtHome/RuleBook/compare/2019.v1..2023.1
@@ -10,6 +11,24 @@ All notable changes to this project will be documented in this file.
 
 ## Rulebook [Current Draft]
 
+* [#887](https://github.com/RoboCupAtHome/RuleBook/pull/887): Remove Social Standard Platform League. 
+  * The League does have a low number of participants. 
+  * Former SSPL Teams can participate in the OPL and thus modify the Robot.
+* [#903](https://github.com/RoboCupAtHome/RuleBook/pull/903): `Carry my luggage` to `Help Me Carry`
+* [#908](https://github.com/RoboCupAtHome/RuleBook/pull/908): Remove the possibility of doing other task during gpsr slot 
+
+## Rulebook [2024.2] - 2024-05-03
+Updated release based on German Open feedback.
+* [#862](https://github.com/RoboCupAtHome/RuleBook/pull/862): Storing Groceries
+* [#863](https://github.com/RoboCupAtHome/RuleBook/pull/863): Receptionist
+* [#864](https://github.com/RoboCupAtHome/RuleBook/pull/864): Carry my Luggage
+* [#865](https://github.com/RoboCupAtHome/RuleBook/pull/865): GPSR
+* [#866](https://github.com/RoboCupAtHome/RuleBook/pull/866): Restaurant
+* [#867](https://github.com/RoboCupAtHome/RuleBook/pull/867): Stickler for the Rules
+* [#868](https://github.com/RoboCupAtHome/RuleBook/pull/868): EGPSR
+* [#869](https://github.com/RoboCupAtHome/RuleBook/pull/869): Serve Breakfast
+* [#870](https://github.com/RoboCupAtHome/RuleBook/pull/870): Scoresheet cleanup
+
 ## Rulebook [2024.1] - 2024-03-05
 * split document into Rulebook and Organization document [(PR)](https://github.com/RoboCupAtHome/RuleBook/pull/831)
   * RoboCup@Home Rulebook: Rules and Regulations for the competition.

README.md

@@ -1,4 +1,4 @@
-RuleBook for RoboCup @Home 2024
+RuleBook for RoboCup @Home 2025
 ===============================
 
 [![CI](https://github.com/RoboCupAtHome/RuleBook/actions/workflows/ci.yml/badge.svg)](https://github.com/RoboCupAtHome/RuleBook/actions/workflows/ci.yml)
@@ -9,7 +9,7 @@ RuleBook for RoboCup @Home 2024
 [Organization guidelines](https://robocupathome.github.io/RuleBook/organization/master.pdf)  
 [Score sheets](https://robocupathome.github.io/RuleBook/scoresheets/master.pdf)  
 
-The current version for 2024 is **final**; only minor (language) updates and clarifications may be made from now on.
+The current version for 2025 is **draft**
 
 [Changelog](CHANGELOG.md)
 
@@ -48,6 +48,13 @@ The RoboCup @Home Organizing Committee is always looking for volunteers to assis
 
 Contributions and improvements to the rulebook are always welcome in the form of pull requests.
 
+### Building
+
+The easiest way is to utilize the `docker.io/texlive/texlive:TL2022-historic` image to build everything.
+
+For convenience, you should execute `build.sh` to make the PDFs with a container runtime. (This requires either `docker` or `podman` to be installed)
+
+
 ### Recorded data
 Data is recorded from the robots during the competition. It is available through the following links:
 

build.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+IMAGE=docker.io/texlive/texlive:TL2022-historic
+
+if command -v podman >/dev/null 2>&1
+then
+    podman run --rm --net=none -w /data/ -v`pwd`:/data -e TERM=xterm-256color $IMAGE make all
+else
+    docker run --rm --user="$(id -u):$(id -g)" --net=none -w /data/ -v`pwd`:/data -e TERM=xterm-256color $IMAGE make all
+fi
+

Roadmap.tex → documents/Roadmap.tex

@@ -11,7 +11,7 @@
 %%% PACKAGES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \input{./setup/packages.tex}
 \input{./setup/config.tex}
-\input{./roadmap/documentinfo.tex}
+\input{./pages/roadmap/documentinfo.tex}
 % footertext
 \newcommand{\footline}{RoboCup@Home Roadmap / \rulebookVersion}
 \input{./setup/styling.tex}
@@ -38,12 +38,12 @@
 
 \begin{document}
 
-\input{./roadmap/titlepage}
+\input{./pages/roadmap/titlepage}
 
 \setcounter{page}{0}
 \pagenumbering{roman}
 \pagestyle{empty}
-\input{./roadmap/acknowledgments}
+\input{./pages/roadmap/acknowledgments}
 \clearpage
 
 \pagestyle{plain}
@@ -53,7 +53,7 @@
 \setcounter{page}{1}
 \pagenumbering{arabic}
 
-\input{CompetitionConcepts}
+\input{roadmap/CompetitionConcepts}
 
 
 

documents/organization.tex

@@ -11,7 +11,7 @@
 %%% PACKAGES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \input{./setup/packages.tex}
 \input{./setup/config.tex}
-\input{./organization/documentinfo.tex}
+\input{./pages/organization/documentinfo.tex}
 % footertext
 \newcommand{\footline}{RoboCup@Home Organization document / \rulebookVersion}
 \input{./setup/styling.tex}
@@ -34,12 +34,12 @@
 
 \begin{document}
 
-	\input{organization/titlepage}
+	\input{pages/organization/titlepage}
 
 	\setcounter{page}{0}
 	\pagenumbering{roman}
 	\pagestyle{empty}
-	\input{organization/about}
+	\input{pages/organization/about}
 	\input{pages/acknowledgments}
 	\clearpage
 
@@ -50,9 +50,9 @@
 	\setcounter{page}{1}
 	\pagenumbering{arabic}
 
-	\input{organization/Introduction}
-	\input{organization/GeneralRules}
-	\input{organization/Setup}
+	\input{pages/organization/Introduction}
+	\input{pages/organization/GeneralRules}
+	\input{pages/organization/Setup}
 
 	\printabx
 	\printidx

documents/rulebook.tex

@@ -11,7 +11,7 @@
 %%% PACKAGES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \input{./setup/packages.tex}
 \input{./setup/config.tex}
-\input{./rulebook_pages/documentinfo.tex}
+\input{./pages/rulebook/documentinfo.tex}
 % footertext
 \newcommand{\footline}{RoboCup@Home Rulebook / \rulebookVersion}
 \input{./setup/styling.tex}
@@ -38,12 +38,12 @@
 
 \begin{document}
 
-\input{./rulebook_pages/titlepage}
+\input{./pages/rulebook/titlepage}
 
 \setcounter{page}{0}
 \pagenumbering{roman}
 \pagestyle{empty}
-\input{rulebook_pages/about}
+\input{pages/rulebook/about}
 \input{pages/acknowledgments}
 \clearpage
 
@@ -54,11 +54,11 @@
 \setcounter{page}{1}
 \pagenumbering{arabic}
 
-\input{rulebook_pages/Introduction}
+\input{pages/rulebook/Introduction}
 
-%\input{CompetitionConcepts}
+%\input{roadmap/CompetitionConcepts}
 
-\input{rulebook_pages/GeneralRules}
+\input{pages/rulebook/GeneralRules}
 
 %\input{Setup}
 
@@ -79,7 +79,7 @@ \chapter{Tests in Stage I}
 
 % Uncomment to get aesthetic improvement
 \cleardoublepage
-\input{tasks/CarryMyLuggage}
+\input{tasks/HelpMeCarry}
 \newpage
 \input{tasks/GPSR}
 \newpage
@@ -117,7 +117,7 @@ \chapter{Tests in Stage II}
 
 %%% FINALS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\input{tests/Finals}
+\input{tasks/Finals}
 
 
 \printabx

documents/scoresheets.tex

@@ -89,7 +89,7 @@
 
 \pagestyle{plain}
 
-\input{registration_form.tex}
+\input{pages/scoresheets/registration_form.tex}
 
 \renewcommand{\shortScoresheet}{false}
 
@@ -104,9 +104,9 @@
 %%% STAGE I %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% STAGE 1 TESTS GO HERE %%%
 
-\renewcommand{\currentTest}{Carry my Luggage}
+\renewcommand{\currentTest}{Help Me Carry}
 \begin{scoresheet}
-\input{scoresheets/CarryMyLuggage}
+\input{scoresheets/HelpMeCarry}
 \end{scoresheet}
 
 \renewcommand{\currentTest}{General Purpose Service Robot}

Appendices.tex → pages/Appendices.tex

@@ -4,7 +4,7 @@
 
 \input{pages/example_skills}
 \newpage
-\input{general_rules/arena_decorations.tex}
+\input{pages/general_rules/arena_decorations.tex}
 
 \end{appendices}
 

pages/example_skills.tex

@@ -2,7 +2,7 @@ \chapter{Example Skills}
 \label{chap:example-skills}
 
 The following section presents a list of \iterm{Example Skills} with an high degree of difficulty which can be exploited during the \textit{Open Demonstrations} (See~\refsec{sec:open-demonstrations}.
-Other skills not on this list (yet) may be added as well. If you want to do so, please let the TC know via email (tc@robocupathome.org) for their inclusion on the RuleBook so all teams may also show this skill.
+Other skills not on this list (yet) may be added as well. If you want to do so, please let the TC know via email (rc-home-tc@lists.robocup.org) for their inclusion on the RuleBook so all teams may also show this skill.
 
 Please note that these examples are to illustrate the level of complexity and applicability that should be shown. For instance, \enquote{Handle a pan} is listed in the category of \textit{Complex manipulation}, but it is extensive to handling pans, pots, woks and any other cookware with handles.
 

general_rules/Organization.tex → pages/general_rules/Organization.tex

@@ -34,7 +34,6 @@ \subsection{Schedule}
 
 	\item \textbf{Participation is default:} Teams have to inform the OC in advance if they are skipping a Test Block. Without such indication, they may receive a penalty when not attending (see~\refsec{rule:not_attending}).
 
-	\item \textbf{GPSR Block: } During the GPSR slot teams are allowed to perform one Stage 1 test of their choice instead, to allow more attempts for newer or specialized teams. Note that participation in GPSR is mandatory to advance to Stage 2. 
 \end{enumerate}
 
 % Please add the following required packages to your document preamble:
@@ -79,7 +78,7 @@ \subsection{Schedule}
 		\\\hhline{~---~}
 
 	\cell{Block 1\\\footnotesize(9:00--11:00)}
-		& \cell{Carry my Luggage}
+		& \cell{Help Me Carry}
 		& \cell{Serve Breakfast}
 		& \cell{Restaurant}
 		& \cellcolor{white}

general_rules/Robots.tex → pages/general_rules/Robots.tex

@@ -26,9 +26,9 @@ \subsection{Appearance and Safety}
 \end{enumerate}
 The compliance with these rules will be verified during \RobotInspection{} (see \ref{sec:robot_inspection}).
 
-\input{general_rules/Robots-SPL}
+\input{pages/general_rules/Robots-SPL}
 
-\input{general_rules/Robots-OPL}
+\input{pages/general_rules/Robots-OPL}
 
 
 

introduction/Awards.tex → pages/introduction/Awards.tex

@@ -45,7 +45,7 @@ \subsection{Best Human-Robot Interface Award}
 \subsection{Best Poster Award}
 \label{award:poster}
 
-To foster scientific knowledge exchange and reward the teams' efforts to present their research contributions, all scientific posters of each league are evaluated and have the chance of receiving the \DSPLPosterAward, the \OPLPosterAward, or the \SSPLPosterAward, respectively.
+To foster scientific knowledge exchange and reward the teams' efforts to present their research contributions, all scientific posters of each league are evaluated and have the chance of receiving the \DSPLPosterAward or the \OPLPosterAward respectively.
 
 Candidate posters must present innovative and state-of-the-art research within a field with a direct application to \AtHome, and demonstrate successful and clear results in an easy-to-understand way.
 In addition to being attractive and well-rated in the \PS{} (see~\refsec{sec:poster_teaser_session}), the described research must have impact in the team's performance during the competition.

introduction/Leagues.tex → pages/introduction/Leagues.tex

@@ -7,11 +7,10 @@
 \section{Leagues}
 \label{sec:leagues}
 
-\AtHome{} is divided into three Leagues. One of these grants complete freedom to all competitors with respect to the robot used, while two of them are \SPLs{}, namely all competitors use the same robot. The official leagues and their names are:
+\AtHome{} is divided into two Leagues. One of these grants complete freedom to all competitors with respect to the robot used, while in the other all competitors use the same robot. The official leagues and their names are:
 \begin{itemize}
   \item \OPL
   \item \DSPL
-  \item \SSPL
 \end{itemize}
 
 \begin{wrapfigure}[21]{r}{0.30\textwidth}
@@ -22,14 +21,6 @@ \section{Leagues}
 		\caption{Toyota HSR}
 		\label{fig:toyota_hsr}
 	\end{center}
-
-	\vspace{-20pt}
-	\begin{center}
-		\includegraphics[width=0.20\textwidth]{images/softbank_pepper.png}
-		\vspace{-10pt}
-		\caption{Softbank / Aldebaran Pepper}
-		\label{fig:softbank_pepper}
-	\end{center}
 \end{wrapfigure}
 Each league focuses on a different aspect of service robotics by targeting specific abilities.
 
@@ -39,13 +30,6 @@ \subsection{Domestic Standard Platform League (DSPL)}
 As a consequence, the DSPL focuses on \AmI, \CV, \OM, safe indoor \NAV{} and \MAP, and \TP.
 The robot used in the DSPL is the \HSR, shown in Figure \ref{fig:toyota_hsr}.
 
-\subsection{Social Standard Platform League (SSPL)}
-
-The SSPL takes robots away from a traditional passive servant role, as the robot is now the one who actively looks for interaction.
-From a party waiter in a domestic environment to a hostess in a museum or shopping mall, in SSPL we look for the next user who may require the robot's services.
-Hence, this league focuses on \HRI, \NLP, \PerDet{} and \PerRec, \AB, and safe outdoor \NAV{} and \MAP.
-The robot to be used in the SSPL is the \PEPPER, shown in Figure \ref{fig:softbank_pepper}.
-
 \subsection{Open Platform League (OPL)}
 
 The OPL has had the same modus operandi since the foundation of \AtHome.

introduction/Organization.tex → pages/introduction/Organization.tex

@@ -8,20 +8,20 @@ \section{Organization}
 
 \AtHome{} is organized into three subcommittees. The current members of the committees are listed at \url{https://athome.robocup.org/committees/}.
 
-\subsection{Executive Committee --- ec@robocupathome.org}
+\subsection{Executive Committee --- rc-home-ec@lists.robocup.org}
 \label{sec:ec}
 
 The \EC{} consists of members of the board of trustees, and representatives of each activity area, and supervises both the TC and OC.
 The committee is responsible for the long-term planning of the league and cast the final vote in all decisions within the competition, including those pertaining to any of the committees and any other affair that requires a qualified vote.
 Additionally, the EC must act when any of the committees fail, as it responds to the Trustee board and directs the league accordingly.
 
-\subsection{Technical Committee --- tc@robocupathome.org}
+\subsection{Technical Committee --- rc-home-tc@lists.robocup.org}
 \label{sec:tc}
 
 The \TC{} is responsible for the rules of the league; its main focus is writing the rulebook and refereeing.
 The members of the EC are always members of the TC as well.
 
-\subsection{Organizing Committee --- oc@robocupathome.org}
+\subsection{Organizing Committee --- rc-home-oc@lists.robocup.org}
 \label{sec:oc}
 
 The \OC{} is responsible for the organization of the competition, namely it creates the schedule and provides information about the scenarios.

organization/GeneralRules.tex → pages/organization/GeneralRules.tex

@@ -12,25 +12,25 @@ \chapter{General Rules and Regulations}
 Every rule in this section can be considered to implicitly include the term \emph{\enquote{unless stated otherwise}}.
 This means that additional or contrary rules, in particular with respect to the specification of tests, have a higher priority than those mentioned in the general rules and regulations.
 
-\input{general_rules/TeamRegistration}
+\input{pages/general_rules/TeamRegistration}
 
-\input{general_rules/vizbox}
+\input{pages/general_rules/vizbox}
 
-%\input{general_rules/Scenario}
+%\input{pages/general_rules/Scenario}
 
-\input{general_rules/Robots}
+\input{pages/general_rules/Robots}
 
-\input{general_rules/ExternalDevices}
+\input{pages/general_rules/ExternalDevices}
 
-\input{general_rules/Organization}
+\input{pages/general_rules/Organization}
 
-\input{general_rules/Procedure}
+\input{pages/general_rules/Procedure}
 
-%\input{general_rules/ContinueRules.tex}
+%\input{pages/general_rules/ContinueRules.tex}
 
-\input{general_rules/PenaltiesBonuses}
+\input{pages/general_rules/PenaltiesBonuses}
 
-\input{general_rules/OpenChallenge}
+\input{pages/general_rules/OpenChallenge}
 
 % Local Variables:
 % TeX-master: "Rulebook"