Skip to content

Commit cea2c1e

Browse files
LeroyRLeroyR
authored
Merge pull request #846 from RoboCupAtHome/release-2024
Prepare 2024 Release
2 parents 01eecfe + fa79d26 commit cea2c1e

14 files changed

+131
-145
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,4 @@
2727
*.pdf
2828
.temp_*
2929
*.backup
30+
*.rubbercache

‎CHANGELOG.md

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Changelog
2+
3+
[Current Draft]: https://github.com/RoboCupAtHome/RuleBook/compare/2023.2..HEAD
4+
[2024.1]: https://github.com/RoboCupAtHome/RuleBook/compare/2023.2..2024.1
5+
[2023.2]: https://github.com/RoboCupAtHome/RuleBook/compare/2023.1..2023.2
6+
[2023.1]: https://github.com/RoboCupAtHome/RuleBook/compare/2019.v1..2023.1
7+
8+
9+
All notable changes to this project will be documented in this file.
10+
11+
## Rulebook [Current Draft]
12+
13+
## Rulebook [2024.1] - 2024-03-05
14+
* split document into Rulebook and Organization document [(PR)](https://github.com/RoboCupAtHome/RuleBook/pull/831)
15+
* RoboCup@Home Rulebook: Rules and Regulations for the competition.
16+
* RoboCup@Home Organization document: Rules and Regulations on the organization of the competition
17+
* [New Command Generator for GPSR](https://github.com/johaq/CommandGenerator/tree/master)
18+
* updated Task: EGPSR [(PR)](https://github.com/RoboCupAtHome/RuleBook/pull/844)
19+
* Robot has to restore the default arena state and requests
20+
* add a social survey in restaurant and receptionist tasks [(PR)](https://github.com/RoboCupAtHome/RuleBook/pull/839)
21+
* requesting Deus Ex Machina assistance now requires the robot to show its perception [(PR)](https://github.com/RoboCupAtHome/RuleBook/pull/838)
22+
* small scoring items for attempting tasks, and more consistent scoring between tests [(PR)](https://github.com/RoboCupAtHome/RuleBook/pull/843)

‎README.md

+9-18
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,29 @@
1-
RuleBook for RoboCup @Home 2022
1+
RuleBook for RoboCup @Home 2024
22
===============================
33

44
[![CI](https://github.com/RoboCupAtHome/RuleBook/actions/workflows/ci.yml/badge.svg)](https://github.com/RoboCupAtHome/RuleBook/actions/workflows/ci.yml)
55

6-
The 2022 rulebook is based on the 2019 rulebook. The current version is **final**; only minor (language) updates and clarifications may be made from now on.
6+
### PDF Downloads
77

8-
[On-the-fly compiled LaTeX version](https://robocupathome.github.io/RuleBook/rulebook/master.pdf)
8+
[Rulebook](https://robocupathome.github.io/RuleBook/rulebook/master.pdf)
9+
[Organization guidelines](https://robocupathome.github.io/RuleBook/organization/master.pdf)
10+
[Score sheets](https://robocupathome.github.io/RuleBook/scoresheets/master.pdf)
911

10-
[Released PDF version](https://athome.robocup.org/wp-content/uploads/2022_rulebook.pdf)
12+
The current version for 2024 is **final**; only minor (language) updates and clarifications may be made from now on.
13+
14+
[Changelog](CHANGELOG.md)
1115

1216
RoboCup@Home teams and team members are welcome to post GitHub issues for clarifications, questions etc.
1317

1418
Improvements are also welcome in the form of pull requests (see [guidelines](https://github.com/RoboCupAtHome/RuleBook/wiki/Guidelines)).
1519

16-
[Score sheets](https://robocupathome.github.io/RuleBook/scoresheets/master.pdf))
20+
1721

1822
### FAQ
1923
See the Frequently Asked Questions [here](https://github.com/RoboCupAtHome/RuleBook/wiki/FAQ:-Frequently-Asked-Questions).
2024

2125
Or ask us via Telegram: [https://t.me/RoboCupAtHome](https://t.me/RoboCupAtHome)
2226

23-
### Change log
24-
The Rulebook has being completely restructured for 2019 and later competitions.
25-
The new format was first tested at German Open 2019.
26-
27-
#### Highlights
28-
- **Less stressful competition:** Each competition day will have 2 *testing blocks* (e.g.from 9:00 to 12:00 and from 15:00 to 18:00), giving time to teams to eat, rest, and prepare.
29-
- **Thematic *free* testing:** Each *testing block* will have assigned a *scenario*, namely cleaning the house or hosting a party. Teams will have assigned at least 2 testing slots to solve the *task* of their choise.
30-
- **Task-driven testing:** Tests are no more. The rulebook will have a battery of tasks featuring different abilities from which teams can choose which to solve. It won't be possible to solve all tasks.
31-
- **Goal-driven scoring:** A robot can only score by accomplishing the *main goal* of a *task*. In addition to the *main goal*, several bonus objectives are available with juicy rewards, but will be only considered if the *main goal* is completed.
32-
- **Unlimited *Continues*:** The continue rule is no more. Instead, robots may call for a *Deus Ex Machina* and have human assistant helping it to solve the task. There is no limit on the number of times a robot can ask for help, and the nature of the help is unconstrained. Nonetheless, a proportional score reduction applies.
33-
34-
These changes obey to one objective: **robots must succeed**.
35-
3627

3728
### Question, issues, and contribution Guidelines
3829
- When asking questions [please follow these Guidelines](https://github.com/RoboCupAtHome/RuleBook/wiki/Guidelines:-Questions).

‎citation.bib

-8
This file was deleted.

‎citation_organization.bib

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
@misc{rulebook_orga_2024,
2+
author = {Hart, Justin and Moriarty, Alexander and Pasternak, Katarzyna
3+
and Kummert, Johannes and Hawkin, Alina and Hassouna, Vanessa
4+
and Pena Narvaez, Juan Diego and Ruegemer, Leroy
5+
and von Seelstrang, Leander and Van Dooren, Peter
6+
and Garcia, Juan Jose, and Mitzutani, Akinobu
7+
and Jiang, Yuqian and Matsushima, Tatsuya and Polvara, Riccardo},
8+
title = {RoboCup@Home 2024: Regulations on the organization of the competition},
9+
year = {2024},
10+
howpublished = {\url{https://github.com/RoboCupAtHome/RuleBook/releases/tag/2024.1}},
11+
}

‎citation_rulebook.bib

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
@misc{rulebook_2024,
2+
author = {Hart, Justin and Moriarty, Alexander and Pasternak, Katarzyna
3+
and Kummert, Johannes and Hawkin, Alina and Hassouna, Vanessa
4+
and Pena Narvaez, Juan Diego and Ruegemer, Leroy
5+
and von Seelstrang, Leander and Van Dooren, Peter
6+
and Garcia, Juan Jose, and Mitzutani, Akinobu
7+
and Jiang, Yuqian and Matsushima, Tatsuya and Polvara, Riccardo},
8+
title = {RoboCup@Home 2024: Rules and Regulations},
9+
year = {2024},
10+
howpublished = {\url{https://github.com/RoboCupAtHome/RuleBook/releases/tag/2024.1}},
11+
}

‎organization.tex

+2-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@
3939
\setcounter{page}{0}
4040
\pagenumbering{roman}
4141
\pagestyle{empty}
42-
\input{organization/acknowledgments}
42+
\input{organization/about}
43+
\input{pages/acknowledgments}
4344
\clearpage
4445

4546
\pagestyle{plain}

‎organization/about.tex

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
2+
%%
3+
%% $Id: about.tex
4+
%% author(s): RoboCupAtHome Technical Committee(s)
5+
%% description: About for the RoboCupAtHome organization guidelines
6+
%%
7+
%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
8+
9+
\section*{About this document}
10+
These are the organization guidelines of the RoboCup@Home competition \YEAR. It contains the procedures surrounding the Robocup@Home competition. Both those leading up to the event and those in place during the competition. This document excludes the tests the robot are expected to perform and the scores associated with them. Those can be found in the \Rulebook.
11+
This document has been written by the \YEAR ~RoboCup@Home Technical Committee.
12+
13+
\section*{How to cite this document}
14+
If you refer to RoboCup@Home and this document in particular, please cite:\\
15+
16+
\noindent Justin Hart, Alexander Moriarty, Katarzyna Pasternak, Johannes Kummert,
17+
Alina Hawkin, Vanessa Hassouna, Juan Diego Pena Narvaez, Leroy Ruegemer,
18+
Leander von Seelstrang, Peter Van Dooren, Juan Jose Garcia, Akinobu Mitzutani,
19+
Yuqian Jiang, Tatsuya Matsushima, Riccardo Polvara
20+
\enquote{Robocup@Home \YEAR: Competition organization document,}
21+
\url{https://github.com/RoboCupAtHome/RuleBook/releases/download/2024.1/organization.pdf}, \YEAR.
22+
23+
\begin{center}
24+
\begin{minipage}{0.8\textwidth}
25+
\footnotesize%
26+
\verbatiminput{citation_organization.bib}
27+
\end{minipage}
28+
\end{center}
29+
30+
\pagebreak

‎organization/acknowledgments.tex

-87
This file was deleted.

‎pages/acknowledgments.tex

+10-27
Original file line numberDiff line numberDiff line change
@@ -6,32 +6,6 @@
66
%%
77
%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
88

9-
10-
11-
\section*{About this rulebook}
12-
This is the official rulebook of the RoboCup@Home competition \YEAR. It contains the tests performed by the robots and the scoring associated with it. But excludes the organisational details, which can be found in the \Organisation.
13-
The rulebook has been written by the \YEAR ~RoboCup@Home Technical Committee.
14-
% Mauricio Matamoros,
15-
% and
16-
% Loy van Beek.
17-
18-
19-
20-
\section*{How to cite this rulebook}
21-
If you refer to RoboCup@Home and this rulebook in particular, please cite:\\
22-
23-
\noindent Justin Hart, Mauricio Matamoros, Alexander Moriarty, Hiroyuki Okada,
24-
Matteo Leonetti, Alex Mitrevski, Katarzyna Pasternak, and Fagner Pimentel
25-
\enquote{Robocup@Home \YEAR: Rule and regulations,}
26-
\url{https://athome.robocup.org/rules/\YEAR_rulebook.pdf}, \YEAR.
27-
28-
\begin{center}
29-
\begin{minipage}{0.8\textwidth}
30-
\footnotesize%
31-
\verbatiminput{citation.bib}
32-
\end{minipage}
33-
\end{center}
34-
359
\section*{Acknowledgments}
3610
\label{sec:acknowledgments}
3711
We would like to thank the members of the Technical Committee who put up the rules and the Organizing Committee who organizes the competition.
@@ -45,14 +19,19 @@ \section*{Acknowledgments}
4519
Akinobu Mizutani\\
4620
Alex Mitrevski\\
4721
Alexander Moriarty\\
22+
Alina Hawkin\\
4823
Caleb Rascon\\
4924
Fagner Pimentel\\
5025
Florian Lier\\
5126
Hiroyuki Okada\\
5227
Johannes Kummert\\
28+
Juan Diego Pena Narvaez\\
29+
Juan Jose Garcia\\
5330
Justin Hart\\
5431
Katarzyna Pasternak\\
5532
Komei Sugiura\\
33+
Leander von Seelstrang\\
34+
Leroy Ruegemer\\
5635
Loy van Beek\\
5736
Luca Iocchi\\
5837
Luca Lach\\
@@ -62,11 +41,15 @@ \section*{Acknowledgments}
6241
Maxime St-Pierre\\
6342
Peter van Dooren\\
6443
Raphael Memmesheimer\\
44+
Riccardo Polvara\\
6545
Sammy Pfeiffer\\
6646
Sebastian Meyer zu Borgsen\\
6747
Sven Wachsmuth\\
48+
Tatsuya Matsushima\\
6849
Tijn van der Zant\\
69-
Yuma Yoshimoto
50+
Vanessa Hassouna\\
51+
Yuma Yoshimoto\\
52+
Yuqian Jiang
7053
\end{multicols}
7154
\end{minipage}
7255
\end{center}

‎rulebook.tex

+3-2
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,13 @@
3838

3939
\begin{document}
4040

41-
\input{./pages/titlepage}
41+
\input{./rulebook_pages/titlepage}
4242

4343
\setcounter{page}{0}
4444
\pagenumbering{roman}
4545
\pagestyle{empty}
46-
\input{./pages/acknowledgments}
46+
\input{rulebook_pages/about}
47+
\input{pages/acknowledgments}
4748
\clearpage
4849

4950
\pagestyle{plain}

‎rulebook_pages/about.tex

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
2+
%%
3+
%% $Id: about.tex
4+
%% author(s): RoboCupAtHome Technical Committee(s)
5+
%% description: About for the RoboCupAtHome RuleBook
6+
%%
7+
%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
8+
9+
\section*{About this rulebook}
10+
This is the official rulebook of the RoboCup@Home competition \YEAR. It contains the tests performed by the robots and the scoring associated with it. But excludes the organisational details, which can be found in the \Organisation.
11+
The rulebook has been written by the \YEAR ~RoboCup@Home Technical Committee.
12+
13+
\section*{How to cite this rulebook}
14+
If you refer to RoboCup@Home and this rulebook in particular, please cite:\\
15+
16+
\noindent Justin Hart, Alexander Moriarty, Katarzyna Pasternak, Johannes Kummert,
17+
Alina Hawkin, Vanessa Hassouna, Juan Diego Pena Narvaez, Leroy Ruegemer,
18+
Leander von Seelstrang, Peter Van Dooren, Juan Jose Garcia, Akinobu Mitzutani,
19+
Yuqian Jiang, Tatsuya Matsushima, Riccardo Polvara
20+
\enquote{Robocup@Home \YEAR: Rule and regulations,}
21+
\url{https://github.com/RoboCupAtHome/RuleBook/releases/download/2024.1/rulebook.pdf}, \YEAR.
22+
23+
\begin{center}
24+
\begin{minipage}{0.8\textwidth}
25+
\footnotesize%
26+
\verbatiminput{citation_rulebook.bib}
27+
\end{minipage}
28+
\end{center}
29+
30+
\pagebreak

‎pages/titlepage.tex renamed to ‎rulebook_pages/titlepage.tex

File renamed without changes.

‎setup/active_version.tex

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
\newcommand{\YEAR}{2024}
2-
\newcommand{\STATE}{Draft}
3-
% \newcommand{\STATE}{Final}
2+
%\newcommand{\STATE}{Draft}
3+
\newcommand{\STATE}{Final}
44
%
55
% Local Variables:
66
% TeX-master: "../Rulebook"

0 commit comments

Comments
 (0)