Adds new scoring at intersections

CAuDri · Dec 30, 2024 · f859d2b · f859d2b
1 parent d86df0f
commit f859d2b
Showing 1 changed file with 50 additions and 24 deletions.
diff --git a/source/content/obstacle_course.tex b/source/content/obstacle_course.tex
@@ -344,49 +344,75 @@ \subsection{Scoring}{
 		\end{tabularx}
 	\end{table}
 
-	\subsubsection*{Intersections of the Rural Road Scenario}
+	\subsubsection*{\HighlightNew{Intersection Obstacles}}
 	\begin{table}[H]
 		\begin{tabularx}{\textwidth}{XXX}
 			\toprule
-			\textbf{Positive}                                           & \textbf{Neutral}                                                   & \textbf{Negative}                                              \\
+			\textbf{Positive}                & \textbf{Neutral}                & \textbf{Negative}          \\
 			\midrule
-			Vehicle went straight through the intersection              & Vehicle made a wrong turn                                          & Collision with an Obstacle                                     \\
-			\textit{Vehicle stopped at the stop line}\footnotemark[1]   & \textit{Vehicle stopped for < 3s}\footnotemark[1]                  & \textit{Vehicle did not stop at the stop line}\footnotemark[1] \\
-			                                                            & \textit{Distance from stop-line > 15cm}\footnotemark[1]            &                                                                \\
-			\textit{Vehicle respected the right-of-way}\footnotemark[2] & \textit{Vehicle did not respect the right-of-way}\footnotemark[2]  &                                                                \\
-			                                                            & \textit{Obstacle has not cleared the intersection}\footnotemark[2] &                                                                \\
+			Respected the right-of-way 				& Did not respect the right-of-way 					& Collision with an Obstacle	\\
+			                            			& Obstacle has not fully cleared the intersection  	&                            	\\
 			\topstrut
-			\textbf{+10}                                                & \textbf{0}                                                         & \textbf{-10}                                                   \\
+			\textbf{+10}                    & \textbf{0}                      	& \textbf{-10}               \\
 			\bottomrule
 		\end{tabularx}
 	\end{table}
 
-	\footnotetext[1]{In case a stop line is present}
-	\footnotetext[2]{In case a dynamic Obstacle is present}
+	\newpage
+
 
-	\subsubsection*{Extended Intersections}
+	\subsubsection*{\HighlightNew{Stop and Give-Way Intersection}}
 	\begin{table}[H]
 		\begin{tabularx}{\textwidth}{XXX}
 			\toprule
-			\textbf{Positive}                                           & \textbf{Neutral}                                                   & \textbf{Negative}                                      \\
+			\textbf{Positive}                & \textbf{Neutral}                & \textbf{Negative}          \\
 			\midrule
-			Vehicle stopped at the stop or give-way line                & \textit{Distance from stop-line > 15cm}\footnotemark[1]            & \textit{Did not stop at the stop line}\footnotemark[1] \\
-			                                                            & \textit{Stopped for < 3s at stop line}\footnotemark[1]             &                                                        \\
-			                                                            & \textit{Stopped for < 1s at give-way line}\footnotemark[3]         &                                                        \\
-			\textit{Vehicle respected the right-of-way}\footnotemark[2] & \textit{Vehicle did not respect the right-of-way}\footnotemark[2]  & Collision with an Obstacle                             \\
-			                                                            & \textit{Obstacle has not cleared the intersection}\footnotemark[2] &                                                        \\
-			\textit{Vehicle took the right turn}\footnotemark[4]        & \textit{Vehicle took the wrong turn}\footnotemark[4]               &                                                        \\
-			                                                            &                                                                    &                                                        \\
+			Stopped at the stop or give-way line	& Distance from stop or give-way line > 15cm 	& Did not stop at the stop line \footnotemark[1]	\\
+			Went straight through the intersection	& Made a wrong turn								&													\\
+													& Stopped for < 3s at stop line 				&													\\
+													& Stopped for < 1s at give-way line				& 													\\
 			\topstrut
-			\textbf{+20}                                                & \textbf{0}                                                         & \textbf{-10}                                           \\
+			\textbf{+5}                     & \textbf{0}                      & \textbf{-5}               \\
 			\bottomrule
 		\end{tabularx}
 	\end{table}
 
-	\footnotetext[1]{In case a stop line is present}
-	\footnotetext[2]{In case a dynamic Obstacle is present}
-	\footnotetext[3]{In case a give-way line is present}
-	\footnotetext[4]{In case the intersection has a mandatory turn}
+	\subsubsection*{\HighlightNew{Priority-to-Right Intersection}}
+	\begin{table}[H]
+		\begin{tabularx}{\textwidth}{XXX}
+			\toprule
+			\textbf{Positive}                & \textbf{Neutral}                & \textbf{Negative}          \\
+			\midrule
+			Stopped at the give-way line			& Distance from give-way line > 15cm 	& 	\\
+			Went straight through the intersection	& Made a wrong turn						&	\\
+													& Stopped for < 1s at give-way line		& 	\\
+
+			\topstrut
+			\textbf{+10}                     & \textbf{0}                      & \textit{No negative points possible}               \\
+			\bottomrule
+		\end{tabularx}
+	\end{table}
+
+	\subsubsection*{\HighlightNew{Mandatory Direction Intersection}}
+	\begin{table}[H]
+		\begin{tabularx}{\textwidth}{XXX}
+			\toprule
+			\textbf{Positive}                & \textbf{Neutral}                & \textbf{Negative}          \\
+			\midrule
+			Stopped at the stop or give-way line	& Distance from stop or give-way line > 15cm 	& Did not stop at the stop line \footnotemark[1]	\\
+			Took the correct turn					& Made a wrong turn \footnotemark[2]			&													\\
+													& Stopped for < 3s at stop line 				&													\\
+													& Stopped for < 1s at give-way line				& 													\\
+			\topstrut
+			\textbf{+10}                     & \textbf{0}                      & \textbf{-5}               \\
+			\bottomrule
+		\end{tabularx}
+	\end{table}
+
+	\footnotetext[1]{Only applies for stop and not for give-way line}
+	\footnotetext[2]{Includes driving straight incorrectly}
+	\newpage
+
 
 	\subsubsection*{No-Passing Zones}
 	\begin{table}[H]