From dd72ee9d3bdfc3a8b3c3726af309fee5b8933d4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leroy=20R=C3=BCgemer?= Date: Mon, 19 Aug 2024 13:17:39 +0200 Subject: [PATCH 1/2] Remove SSPL League --- introduction/Awards.tex | 2 +- introduction/Leagues.tex | 18 +----------------- scoresheets/SPR.tex | 4 ++-- setup/macros.tex | 3 --- setup/macros_leagues.tex | 28 ++-------------------------- tasks/Farewell.tex | 2 +- teams/SSPL.tex | 24 ------------------------ teams/finals.tex | 3 --- tests/CocktailParty.tex | 2 +- tests/Finals.tex | 3 +-- tests/HelpMeCarry.tex | 29 +++++------------------------ tests/OpenChallenge.tex | 34 +++++++++++++++++----------------- tests/SPR.tex | 2 +- tests/TourGuide.tex | 4 ++-- 14 files changed, 34 insertions(+), 124 deletions(-) delete mode 100644 teams/SSPL.tex diff --git a/introduction/Awards.tex b/introduction/Awards.tex index 4bae2a65..dfeaa19f 100644 --- a/introduction/Awards.tex +++ b/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. diff --git a/introduction/Leagues.tex b/introduction/Leagues.tex index 076e14d2..b8cec27c 100644 --- a/introduction/Leagues.tex +++ b/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. diff --git a/scoresheets/SPR.tex b/scoresheets/SPR.tex index 16260fba..e559c4a7 100644 --- a/scoresheets/SPR.tex +++ b/scoresheets/SPR.tex @@ -12,7 +12,7 @@ \scoreitem{ 5}{Answering all 5 riddle game question} \ifDSPL{ - \scoreheading{[DSPL only] Blind man's bluff game} % Max 130 + \scoreheading{[DSPL] Blind man's bluff game} % Max 130 \scoreitem[10]{ 5}{Understanding question on the first attempt} % 50 \scoreitem[10]{ 2}{Understanding question on the second attempt} % -- (20) \scoreitem[10]{ 2}{Correctly answered a question} % 20 @@ -21,7 +21,7 @@ } \ifNotDSPL{ - \scoreheading{[OPL \& SSPL] Blind man's bluff game} % Max 130 + \scoreheading{[OPL] Blind man's bluff game} % Max 130 \scoreitem[ 5]{10}{Understanding question on the first attempt} % 50 \scoreitem[ 5]{ 5}{Understanding question on the second attempt} % -- (25) \scoreitem[ 5]{ 5}{Correctly answered a question} % 25 diff --git a/setup/macros.tex b/setup/macros.tex index 52ac3331..87ae03e1 100644 --- a/setup/macros.tex +++ b/setup/macros.tex @@ -25,7 +25,6 @@ \def\SPL{\iaterm{Standard Platform League}{SPL}} \def\SPLs{\iaterm{Standard Platform Leagues}{SPLs}} \def\DSPL{\iaterm{Domestic Standard Platform League}{DSPL}} -\def\SSPL{\iaterm{Social Standard Platform League}{SSPL}} \def\EC{\iaterm{executive committee}{EC}} \def\TC{\iaterm{technical committee}{TC}} @@ -56,7 +55,6 @@ \def\HSR{\iterm{Toyota HSR}} \def\MountingBracket{\iterm{Mounting Bracket}} -\def\PEPPER{\iterm{Softbank Pepper}} \def\SetupDays{\iterm{Setup Days}} \def\PS{\iterm{Poster Session}} @@ -75,7 +73,6 @@ \def\HRIAward{\iterm{Best Human-Robot Interface Award}} \def\DSPLPosterAward{\iterm{Best DSPL Poster Award}} -\def\SSPLPosterAward{\iterm{Best SSPL Poster Award}} \def\OPLPosterAward{\iterm{Best OPL Poster Award}} \def\OCAward{\iterm{Best Open Challenge Award}} diff --git a/setup/macros_leagues.tex b/setup/macros_leagues.tex index 18ada772..7e5eaccd 100644 --- a/setup/macros_leagues.tex +++ b/setup/macros_leagues.tex @@ -25,12 +25,6 @@ \newcommand{\leagueFullName}{Domestic Standard Platform League} }{} -%% Import team from the Social Standard Platform League %%%%%%%%% %% -\ifthenelse{\equal{\league}{SSPL}}{ - \newcommand\teamsListFile{teams/SSPL.tex} - \newcommand{\leagueFullName}{Social Standard Platform League} -}{} - %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% %% Per league macros %% @@ -42,7 +36,7 @@ } \newcommand{\ifNotDSPL}[1]{ - \ifthenelse{\equal{\league}{} \OR \equal{\league}{OPL} \OR \equal{\league}{SSPL}}{#1}{} + \ifthenelse{\equal{\league}{} \OR \equal{\league}{OPL}}{#1}{} } @@ -52,27 +46,9 @@ } \newcommand{\ifNotOPL}[1]{ - \ifthenelse{\equal{\league}{} \OR \equal{\league}{DSPL} \OR \equal{\league}{SSPL}}{#1}{} -} - - -%% Open Standard Platform League %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% -\newcommand{\ifSSPL}[1]{ - \ifthenelse{\equal{\league}{} \OR \equal{\league}{SSPL}}{#1}{} -} - -\newcommand{\ifNotSSPL}[1]{ - \ifthenelse{\equal{\league}{} \OR \equal{\league}{OPL} \OR \equal{\league}{DSPL}}{#1}{} + \ifthenelse{\equal{\league}{} \OR \equal{\league}{DSPL}}{#1}{} } -% \newcommand{\ifLeague}[2]{ -% \ifNotSSPL{#1} -% \ifSSPL{#2} -% } - - - - %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% %% List of teams import macro %% %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% diff --git a/tasks/Farewell.tex b/tasks/Farewell.tex index f1871e2d..fa352882 100644 --- a/tasks/Farewell.tex +++ b/tasks/Farewell.tex @@ -4,7 +4,7 @@ \section{Farewell [Party Host]} \subsection*{Description} Some guests are tired, and they call the robot to retrieve their coat. One guest is a medical doctor and needs to leave urgently. It's raining outside and there is only one umbrella, so the robot takes the guests one by one to their cab and returns - with the (optional for SSPL) umbrella.\\ + with the umbrella.\\ \textbf{Main goal:} diff --git a/teams/SSPL.tex b/teams/SSPL.tex deleted file mode 100644 index 7239a927..00000000 --- a/teams/SSPL.tex +++ /dev/null @@ -1,24 +0,0 @@ -% Teams in stage 1 (all participating teams. If split in two groups, compile two versions of the rulebool/score sheets: one for group A, one for group B -\newcommand{\TEAMSSTAGEONE}{ - KameRider SSPL, - LiU@HomeWreckers, - LyonTech, - SinfonIA Pepper Team, - Uchile Pepper, - UTS Unleashed! -} - -% All teams in stage 2: best 6 (in case of 12 or less teams in stage 1), or best 50% (in case of more than 12 teams in stage 1) -\newcommand{\TEAMSSTAGETWO}{ - Team 1, - Team 2, - Team 3, - Team 4 -} - -\input{teams/finals.tex} - -% Local Variables: -% TeX-master: "../rulebook" -% End: - diff --git a/teams/finals.tex b/teams/finals.tex index 43b8f815..d5f1f682 100644 --- a/teams/finals.tex +++ b/teams/finals.tex @@ -1,8 +1,5 @@ % All teams in the finals: best 2 teams of each league (possibly 3 if the difference between #2 and #3 is less than 1%) \newcommand{\TEAMSFINALS}{ - % SSPL - \textbf{[SSPL]} Team 2, - \textbf{[SSPL]} Team 1, % DSPL \textbf{[DSPL]} Team 2, \textbf{[DSPL]} Team 1, diff --git a/tests/CocktailParty.tex b/tests/CocktailParty.tex index 4df409ac..d906ca3d 100644 --- a/tests/CocktailParty.tex +++ b/tests/CocktailParty.tex @@ -1,4 +1,4 @@ -\section{Cocktail Party [SSPL only]} +\section{Cocktail Party} The robot has to learn and recognize previously unknown people, and fetch orders. diff --git a/tests/Finals.tex b/tests/Finals.tex index e710b0e8..28755439 100644 --- a/tests/Finals.tex +++ b/tests/Finals.tex @@ -16,8 +16,7 @@ \section{Structure and Theme} The objectives for each league for this year are: \begin{itemize} - \item \emph{OPL/DSPL}: The robot helps a person in preparing dinner. - \item \emph{SSPL}: The robot helps a person in preparing dinner. + \item The robot helps a person in preparing dinner. \end{itemize} diff --git a/tests/HelpMeCarry.tex b/tests/HelpMeCarry.tex index 93b147d5..4fc4af78 100644 --- a/tests/HelpMeCarry.tex +++ b/tests/HelpMeCarry.tex @@ -5,12 +5,7 @@ \subsection{Goal} The robot must help bringing some objects into the arena from outside. \subsection{Focus} -This test focuses on safe, robust navigation, people following and navigation in unknown environments. - -\begin{itemize}[leftmargin=3cm] - \item[DSPL \& OPL] Test focuses also in Object Detection and Manipulation. - \item[SSPL] Test focuses also in People Detection and Human-Robot Interaction. -\end{itemize} +This test focuses on safe, robust navigation, people following and navigation in unknown environments as well as in Object Detection and Manipulation. \subsection{Setup} The operator (the robot's owner) has a set of bags (and possibly other objects) that need to be carried from a place outside the arena back inside. @@ -44,24 +39,13 @@ \subsection{Task} \end{enumerate} \setcounter{enumi}{\theenumTemp} - \item {[SSPL only]} \textbf{Look for help} \\ - The robot is asked to find a person in a given room and ask them to assist carrying the groceries (e.g.~\enquote{Look for Louise in the Kitchen and ask her to help us}). - \begin{enumerate} - \item \textbf{Entering the house:} While on its way back to the house, the robot deals with different obstacles along it's path. - \begin{itemize}[leftmargin=3cm] - \item[\textbf{1st section}] While going back to the house, a person crosses robot's path. - \item[\textbf{2nd section}] While going back, a person steps in front of the robot and asks it for the time. - \end{itemize} - - \item \textbf{Find a person:} After reaching the designated room, the robot needs to find a person (there is only one person in the room, the name is meaningless). - \end{enumerate} \item \textbf{Memorizing the \emph{new} operator:} The robot has to memorize the operator that will help. During this phase, the robot may instruct the operator to follow a certain setup procedure. \item \textbf{Guiding the operator:} When the robot signals that it is ready to start guiding, the robot guiding the operator to the car. The robot must clearly announce when the destination (the car) is reached. \begin{itemize}[leftmargin=3cm] - \item[DSPL \& OPL] \textbf{Closed door:} Along it's path to the car, the robot will find a closed door (most likely the entrance to the house) that will need to be opened to reach the destination. - \item[SSPL only] \textbf{Distracted operator:} After leaving the house, the operator is distracted by another person. The robot must re-gain the operator's attention, remind the task, and continue guiding the operator's to the car. + \item \textbf{Closed door:} Along it's path to the car, the robot will find a closed door (most likely the entrance to the house) that will need to be opened to reach the destination. + \end{itemize} \end{enumerate} @@ -77,13 +61,10 @@ \subsection{Obstacles} \item \textbf{Small object:} Small object (e.g.~apple, glass, lego brick, etc). - \item {[DSPL and OPL]} \textbf{Movable Object:} Something that can be moved or pushed away + \item \textbf{Movable Object:} Something that can be moved or pushed away (e.g.~coat rack, rolling chair, lamp, etc). The robot must clearly state it is about to push the object. - - \item {[SSPL Only]} \textbf{\textit{Smart} obstacle:} A person to whom the robot may kindly ask to step aside. - The person can be standing, lying, or sitting (chair or floor). - The robot must look at the person and make clear who is interacting with. + \end{itemize} %% Possible extensions: %% - DONE: allow the operator to tell for each item where it should go diff --git a/tests/OpenChallenge.tex b/tests/OpenChallenge.tex index 84dd8b94..2b89ed6e 100644 --- a/tests/OpenChallenge.tex +++ b/tests/OpenChallenge.tex @@ -75,23 +75,23 @@ \subsubsection{Team-team-interaction:} \item A team not participating in Stage 2 receives no bonus points for this test. \end{enumerate} -\paragraph*{Inter-league collaboration}: -\label{rule:OC-inter-league-collaboration} -Inter-league collaboration must be announced to the OC at least one day before the test. Teams participating in multiple @Home Leagues does receive no bonus for cooperation. Standard Platform robots are allowed to take part in the Open Challenge of the Open Platform League, but Open Platform robots can \emph{not} participate in any Standard Platform League's test. In the same sense, DSPL robots are not allowed in SSPL and vice versa. - -For sake of clarity, please consider the following example: Let be A, B two teams participating in RoboCup @Home where -\begin{itemize} - \item Team A participates in SSPL. - \item Team B participates in both SSPL and OPL. - \item Team A and B have qualified into Stage II. -\end{itemize} -Then, by applying the \textit{Inter-league collaboration Rule} (See~\refsec{rule:OC-inter-league-collaboration}) the following statements can be concluded: -\begin{itemize} - \item B OPL can not participate in A SSPL's open challenge. - \item B OPL can not participate in B SSPL's open challenge. - \item A SSPL can participate in B OPL's open challenge. Team A and B get a bonus because A <> B. - \item B SSPL can participate in B OPL's open challenge. There is no bonus because B = B. -\end{itemize} +% \paragraph*{Inter-league collaboration}: +% \label{rule:OC-inter-league-collaboration} +% Inter-league collaboration must be announced to the OC at least one day before the test. Teams participating in multiple @Home Leagues does receive no bonus for cooperation. Standard Platform robots are allowed to take part in the Open Challenge of the Open Platform League, but Open Platform robots can \emph{not} participate in any Standard Platform League's test. + +% For sake of clarity, please consider the following example: Let be A, B two teams participating in RoboCup @Home where +% \begin{itemize} +% \item Team A participates in SSPL. +% \item Team B participates in both SSPL and OPL. +% \item Team A and B have qualified into Stage II. +% \end{itemize} +% Then, by applying the \textit{Inter-league collaboration Rule} (See~\refsec{rule:OC-inter-league-collaboration}) the following statements can be concluded: +% \begin{itemize} +% \item B OPL can not participate in A SSPL's open challenge. +% \item B OPL can not participate in B SSPL's open challenge. +% \item A SSPL can participate in B OPL's open challenge. Team A and B get a bonus because A <> B. +% \item B SSPL can participate in B OPL's open challenge. There is no bonus because B = B. +% \end{itemize} diff --git a/tests/SPR.tex b/tests/SPR.tex index dd48d4ae..911591fb 100644 --- a/tests/SPR.tex +++ b/tests/SPR.tex @@ -35,7 +35,7 @@ \subsection{Task} The game will end when the 10th question has been made, following a similar distribution of questions as in the riddle game. The robot must answer the question without asking confirmation. Questions may be repeated once. \setcounter{enumi}{\theenumTempSPR} - \item {[OPL \& SSPL]} \textbf{Blind man's bluff game: Circling Crowd.} The crowd will reposition, making a circle around the robot. A random person from the crowd surrounding the robot will ask a question. The robot may + \item {[OPL]} \textbf{Blind man's bluff game: Circling Crowd.} The crowd will reposition, making a circle around the robot. A random person from the crowd surrounding the robot will ask a question. The robot may \begin{itemize} \item Turn towards the person who asked the question and answer the question \item Directly answer the question without turning diff --git a/tests/TourGuide.tex b/tests/TourGuide.tex index b57b487f..9d0d17f2 100644 --- a/tests/TourGuide.tex +++ b/tests/TourGuide.tex @@ -1,4 +1,4 @@ -\section{Tour guide [SSPL only]} +\section{Tour guide} The robot guides spectators to the audience area and answer their questions after explaining what's @Home about. \subsection{Focus} @@ -28,7 +28,7 @@ \subsection{Task} \item \textbf{Guiding the spectators:} The robot must gently ask the spectators to follow it to any of the @Home audience areas and guide them there. Should the people not be willing to follow the robot, it must thank them and start looking for another group of spectators.\\ - \item \textbf{Explaining the league:} Once at the @Home audience area, the robot must ask the spectators to take seat. The robot proceeds to \textit{briefly} introduce RoboCup@Home and explain the Social Standard Platform League's objectives. \\ + \item \textbf{Explaining the league:} Once at the @Home audience area, the robot must ask the spectators to take seat. The robot proceeds to \textit{briefly} introduce RoboCup@Home and explain the League's objectives. \\ \item \textbf{Answering questions:} At the end of the speech, the robot asks for questions from the spectators regarding what it just explained, answering at least two of them. The robot is allowed to rephrase questions before answering them.\\ From 6e4c6601ff15898ea13e68240c69d8ab1abf0dfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leroy=20R=C3=BCgemer?= Date: Mon, 19 Aug 2024 14:03:44 +0200 Subject: [PATCH 2/2] update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dbb47df5..da8d1525 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,10 @@ 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. + ## 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.