restructure orga document

documents/organization.tex

@@ -51,9 +51,15 @@
 	\pagenumbering{arabic}
 
 	\input{organization/Introduction}
-	\input{organization/GeneralRules}
+
+	\input{organization/TeamRegistration}
+
 	\input{organization/Setup}
 
+	\input{organization/Competition}
+
+	\input{organization/GeneralRules}
+
 	\printabx
 	\printidx
 

general_rules/OpenChallenge.tex

@@ -11,5 +11,5 @@ \subsection{Procedure}
 	\item \textbf{Arena Changes:} The team can rearrange the arena when their time slot starts, but all changes need to be reverted as soon as their time slot ends.
 	\item \textbf{Focus:} While the demonstrations are intended to share research insights, we still want to see robots performing; in particular, the \OpenChallenge{} should not be turned into a pure academic lecture.
 	\item \textbf{Leagues:} Ideally, the open challenges of all \AtHome{} leagues will be scheduled consecutively so that everyone has an opportunity to see all demonstrations; however, in case more than 12 participants across the leagues register for the \OpenChallenge, each league will hold their \OpenChallenge{} concurrently.
-	\item \textbf{Award:} The \OpenChallenge{} does not contribute any points towards the official competition score, but participating teams are eligible to receive the \OCAward{} (see \ref{award:oc}).
+	\item \textbf{Award:} The \OpenChallenge{} does not contribute any points towards the official competition score, but participating teams are eligible to receive the \OCAward{}.
 \end{enumerate}

general_rules/inspection.tex

@@ -0,0 +1,38 @@
+\section{Robot Inspection}
+\label{sec:robot_inspection}
+Safety is the most important issue when interacting with humans and operating in the same physical workspace. Because of this, all participating robots are inspected before participating in RoboCup@Home. Every team needs to get their robot(s) inspected and approved so that they can participate in the competition.
+
+\begin{enumerate}
+	\item \textbf{Procedure:} The \RobotInspection{} is conducted like a regular test, namely it starts with opening of the arena door (see~\refsec{rule:start_signal}). One team after another (and one robot after another) has to enter the \Arena{} through a designated entrance door, move to the \textit{Inspection Point}, and leave the arena through the designated exit door. In between entering and leaving, the robot is inspected by the \TC.
+	\item \textbf{Checked aspects:} During the \RobotInspection{}, each robot is checked for compliance with the competition rules (see~\refsec{rule:robots}), in particular:
+	\begin{itemize}
+		\item emergency button(s)
+		\item collision avoidance (a TC member steps in front of the robot)
+		\item voice of the robot (it must be loud and clear)
+		\item custom containers (bowl, tray, etc.)
+		\item external devices (including wireless network), if any
+		\item Alternative human-robot interfaces (see~\refsec{rule:asrcontinue}).
+		\item \textbi{Standard Platform robots}
+		\begin{itemize}
+			\item no modifications have been made
+			\item specification of the \iaterm{Official Standard Laptop}{OSL} (if required)
+		\end{itemize}
+		\item \textbi{Open Platform robots}
+		\begin{itemize}
+			\item robot speed and dimension
+			\item start button (if the team requires it)
+			\item robot speaker system (plug for RF transmission)
+			\item other safety issues (duct tape, hanging cables, sharp edges etc.)
+		\end{itemize}
+	\end{itemize}
+	\item \textbf{Re-inspection:} If the robot is not approved in the inspection, it is the responsibility of the team to get the approval at a later point. Robots are not allowed to participate in any test before passing the \RobotInspection.
+	\item \textbf{Time limit:} The robot inspection is interrupted after three minutes (per robot). When told so by the TC --- in case of time interrupt or failure --- the team has to move the robot out of the \Arena{} through the designated exit door.
+	\item \textbf{Appearance Evaluation:} In addition to the inspection, the TC evaluates the appearance of the robots. Robots are expected to look nice (no duct tape, no cables hanging loose etc.). In case of objection, the TC may penalize the team with a penalty of maximum 50 points.
+	\item \textbf{Accompanying team member:} Each robot is accompanied by only one team member (the team leader is advised).
+	\item \textbf{OC instructions (at least two hours before the \RobotInspection):}
+	\begin{itemize}
+		\item Announce the entry and exit doors.
+		\item Announce the location of the \textit{Inspection Point} in the \Arena{}.
+		\item Specify and announce where and when the poster teaser and the poster presentation session take place.
+	\end{itemize}
+\end{enumerate}

general_rules/Organization.tex → organization/Competition.tex

@@ -2,7 +2,7 @@
 \section{Organization of the Competition}
 \label{sec:procedure_during_competition}
 
-\subsection{Stage System}\label{rule:stages}
+\section{Stage System}\label{rule:stages}
 
 The competition features a \iterm{stage system}, namely it is organized in two stages, each consisting of a number of specific tasks, and ends with a \FINAL.
 \begin{enumerate}
@@ -24,7 +24,7 @@ \subsection{Stage System}\label{rule:stages}
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\subsection{Schedule}
+\section{Schedule}
 \label{rule:schedule}
 
 \begin{enumerate}
@@ -123,7 +123,7 @@ \subsection{Schedule}
 
 \noindent Note that the actual allocation of blocks will be announced by the OC during the \SetupDays{} (see Table \ref{tbl:schedule}).
 
-\subsection{Scoring System}
+\section{Scoring System}
 \label{rule:score_system}
 
 Each task has a main objective and a set of bonus scores.

organization/GeneralRules.tex

@@ -8,29 +8,26 @@
 \chapter{General Rules and Regulations}
 \label{chap:rules}
 
-These are the general rules and regulations for the competition in the \RoboCup\AtHome{} league.
-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.
+These some of the general rules and regulations for the competition in the \RoboCup\AtHome{} league relevant to this Document.
 
-\input{general_rules/TeamRegistration}
+For a full list please consult \Rulebook.
 
-\input{general_rules/vizbox}
+%\input{general_rules/vizbox}
 
 %\input{general_rules/Scenario}
 
 \input{general_rules/Robots}
+\input{general_rules/inspection}
 
 \input{general_rules/ExternalDevices}
 
-\input{general_rules/Organization}
-
 \input{general_rules/Procedure}
 
-%\input{general_rules/ContinueRules.tex}
+\input{general_rules/ContinueRules.tex}
 
 \input{general_rules/PenaltiesBonuses}
 
-\input{general_rules/OpenChallenge}
+%\input{general_rules/OpenChallenge}
 
 % Local Variables:
 % TeX-master: "Rulebook"

organization/Setup.tex

@@ -100,44 +100,7 @@ \subsection{Poster teaser session}
 	\end{itemize}
 \end{enumerate}
 
-\section{Robot Inspection}
-\label{sec:robot_inspection}
-Safety is the most important issue when interacting with humans and operating in the same physical workspace. Because of this, all participating robots are inspected before participating in RoboCup@Home. Every team needs to get their robot(s) inspected and approved so that they can participate in the competition.
 
-\begin{enumerate}
-	\item \textbf{Procedure:} The \RobotInspection{} is conducted like a regular test, namely it starts with opening of the arena door (see~\refsec{rule:start_signal}). One team after another (and one robot after another) has to enter the \Arena{} through a designated entrance door, move to the \textit{Inspection Point}, and leave the arena through the designated exit door. In between entering and leaving, the robot is inspected by the \TC.
-	\item \textbf{Checked aspects:} During the \RobotInspection{}, each robot is checked for compliance with the competition rules (see~\refsec{rule:robots}), in particular:
-	\begin{itemize}
-		\item emergency button(s)
-		\item collision avoidance (a TC member steps in front of the robot)
-		\item voice of the robot (it must be loud and clear)
-		\item custom containers (bowl, tray, etc.)
-		\item external devices (including wireless network), if any
-		\item Alternative human-robot interfaces (see \Rulebook).
-		\item \textbi{Standard Platform robots}
-		\begin{itemize}
-			\item no modifications have been made
-			\item specification of the \iaterm{Official Standard Laptop}{OSL} (if required)
-		\end{itemize}
-		\item \textbi{Open Platform robots}
-		\begin{itemize}
-			\item robot speed and dimension
-			\item start button (if the team requires it)
-			\item robot speaker system (plug for RF transmission)
-			\item other safety issues (duct tape, hanging cables, sharp edges etc.)
-		\end{itemize}
-	\end{itemize}
-	\item \textbf{Re-inspection:} If the robot is not approved in the inspection, it is the responsibility of the team to get the approval at a later point. Robots are not allowed to participate in any test before passing the \RobotInspection.
-	\item \textbf{Time limit:} The robot inspection is interrupted after three minutes (per robot). When told so by the TC --- in case of time interrupt or failure --- the team has to move the robot out of the \Arena{} through the designated exit door.
-	\item \textbf{Appearance Evaluation:} In addition to the inspection, the TC evaluates the appearance of the robots. Robots are expected to look nice (no duct tape, no cables hanging loose etc.). In case of objection, the TC may penalize the team with a penalty of maximum 50 points.
-	\item \textbf{Accompanying team member:} Each robot is accompanied by only one team member (the team leader is advised).
-	\item \textbf{OC instructions (at least two hours before the \RobotInspection):}
-	\begin{itemize}
-		\item Announce the entry and exit doors.
-		\item Announce the location of the \textit{Inspection Point} in the \Arena{}.
-		\item Specify and announce where and when the poster teaser and the poster presentation session take place.
-	\end{itemize}
-\end{enumerate}
 
 
 % Local Variables:

general_rules/TeamRegistration.tex → organization/TeamRegistration.tex

@@ -1,8 +1,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\section{Team Registration and Qualification}
+\chapter{Team Registration and Qualification}
 
-
-\subsection{Registration and Qualification Process}
+\section{Registration Process}
 \label{rule:participation}
 
 Each year, there are three phases in the process towards participation in \AtHome:
@@ -82,7 +81,7 @@ \subsection{Team Website}
 \end{enumerate}
 
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\subsection{Qualification}
+\section{Qualification}
 \label{rule:qualification}
 
 During the \iterm{qualification process}, a selection will be made by the OC.

rulebook_pages/GeneralRules.tex

@@ -12,26 +12,24 @@ \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{general_rules/vizbox}
+\input{general_rules/vizbox}
 
 \input{general_rules/Scenario}
 
-%\input{general_rules/Robots}
+\input{general_rules/Robots}
+\input{general_rules/inspection}
 
-%\input{general_rules/ExternalDevices}
+\input{general_rules/ExternalDevices}
 
-%\input{general_rules/Organization}
-
-%\input{general_rules/Procedure}
+\input{general_rules/Procedure}
 
 \input{general_rules/ContinueRules}
+
 \input{general_rules/PenaltiesBonuses}
 
-%\input{general_rules/OpenChallenge}
+\input{general_rules/OpenChallenge}
 
-%\input{general_rules/ManipulationChallenge}
 % Local Variables:
 % TeX-master: "Rulebook"
 % End: