diff --git a/modules/CACC/.gitignore b/doc/modules/cruiseControl/.gitignore
similarity index 100%
rename from modules/CACC/.gitignore
rename to doc/modules/cruiseControl/.gitignore
diff --git a/modules/CACC/CACC-Module-Test.py b/doc/modules/cruiseControl/CACC-Module-Test.py
similarity index 100%
rename from modules/CACC/CACC-Module-Test.py
rename to doc/modules/cruiseControl/CACC-Module-Test.py
diff --git a/modules/CACC/car.py b/doc/modules/cruiseControl/car.py
similarity index 100%
rename from modules/CACC/car.py
rename to doc/modules/cruiseControl/car.py
diff --git a/modules/CACC/moduleCACC.tex b/doc/modules/cruiseControl/docCACC-content.tex
similarity index 58%
rename from modules/CACC/moduleCACC.tex
rename to doc/modules/cruiseControl/docCACC-content.tex
index 559a5f7fd0840236dfecdf100d35e96ed009d23e..02bf4ac52d39011fa05a97e2a205ecc6cf3dde0b 100644
--- a/modules/CACC/moduleCACC.tex
+++ b/doc/modules/cruiseControl/docCACC-content.tex
@@ -1,91 +1,10 @@
-\documentclass[fleqn,a4paper,12pt]{article}
-\usepackage{geometry}
-\geometry{left=30mm, right=40mm, bottom=30mm}
-\usepackage[german]{babel}
-\usepackage[utf8]{inputenc} %Für Umlaute
-
-\usepackage{amsmath} % Mathematische Symbole
-\usepackage{amssymb} % Nochmehr mathematische Symbole
-\usepackage{stmaryrd} % Für die [[ ]] Klammern (\llbracket, \rrbracket)
-\usepackage{dsfont} % Schriftsatz fuer Zahlenmengensymbole
-%\usepackage{verbatim} % erweiterte Verbatim-Umgebung
-\usepackage{alltt} % Quasi-Verbatim-Umgebung
-\usepackage{fancyhdr} % Eigene Kopfzeilen
-\usepackage{graphics} % Zum Einbinden von Grafiken
-\usepackage{tikz} % Zur Erstellung von Graphen
-\usepackage{listings} % Pseudo-Code Formatierung
-% Einbinden einer eps-Grafik geht so: includegraphics{path}
-
-% Seitenraender
-\addtolength{\voffset}{-2cm}
-\addtolength{\textheight}{0cm}
-\addtolength{\hoffset}{0cm}
-\addtolength{\textwidth}{2cm}
-%\addtolength{\headheight}{2cm} % fuer jeden Strichkode einen Zentimeter
-
-% Skalierung der Grafiken
-\setlength{\unitlength}{1cm}
-
-\pagestyle{fancy} % Eigene Kopfzeilen verwenden
-\frenchspacing % Kein Extrafreiraum nach Satzzeichen
-\setlength{\parindent}{0pt} % Neue Absaetze nicht einruecken
-%\sloppy % Schlampige Absatzformatierung
-\fussy % Penible Absatzformatierung
-\linespread{1.5} % Zeilenabstand
-
-%tikz-definition
-\tikzstyle{rec} = [minimum width=1cm, minimum height=0.8cm, align = left,text centered, draw=black]
-
-%andere Definitionen
-\newcommand{\R}{{\mathbb R}}
-\newcommand{\N}{{\mathbb N}}
-\newcommand{\Z}{{\mathbb Z}}
-\newcommand{\Q}{{\mathbb Q}}
-\newcommand{\C}{{\mathbb C}}
-\newcommand{\F}{\mathcal{F}}
-\newcommand{\less}{\setminus}
-\newcommand{\inv}{{}^{-1}}
-\newcommand{\Land}{\bigwedge}
-\newcommand{\Lor}{\bigvee}
-
-% Kopfzeile
-%\lhead{}
-%\rhead{}
-\lstset{ %
- %backgroundcolor=\color{}, % choose the background color; you must add \usepackage{color} or \usepackage{xcolor}; should come as last argument
- basicstyle=\footnotesize, % the size of the fonts that are used for the code
- breakatwhitespace=false, % sets if automatic breaks should only happen at whitespace
- breaklines=true, % sets automatic line breaking
- captionpos=b, % sets the caption-position to bottom
- %commentstyle=\color{mygreen}, % comment style
- %deletekeywords={...}, % if you want to delete keywords from the given language
- escapeinside={\%*}{*)}, % if you want to add LaTeX within your code
- extendedchars=true, % lets you use non-ASCII characters; for 8-bits encodings only, does not work with UTF-8
- %frame=single, % adds a frame around the code
- keepspaces=true, % keeps spaces in text, useful for keeping indentation of code (possibly needs columns=flexible)
- keywordstyle=\color{blue}, % keyword style
- language=Python, % the language of the code
- %morekeywords={*,...}, % if you want to add more keywords to the set
- numbers=left, % where to put the line-numbers; possible values are (none, left, right)
- numbersep=5pt, % how far the line-numbers are from the code
- numberstyle=\tiny,%\color{mygray}, % the style that is used for the line-numbers
- %rulecolor=\color{black}, % if not set, the frame-color may be changed on line-breaks within not-black text (e.g. comments (green here))
- showspaces=false, % show spaces everywhere adding particular underscores; it overrides 'showstringspaces'
- showstringspaces=false, % underline spaces within strings only
- showtabs=false, % show tabs within strings adding particular underscores
- stepnumber=1, % the step between two line-numbers. If it's 1, each line will be numbered
- stringstyle=\color{mymauve}, % string literal style
- tabsize=2, % sets default tabsize to 2 spaces
- title=\lstname % show the filename of files included with \lstinputlisting; also try caption instead of title
-}
-\begin{document}
- \section{CACC-Modul}
- \subsection{Problembeschreibung und Einordnung}
+\subsection{CACC-Modul}
+ \subsubsection{Problembeschreibung und Einordnung}
Das \textit{CACC}-Modul (Cooperativ adaptive curse controll) hat die Aufgabe dem eigenen Fahrzeug (eFZ) aus seinen aktuellen Daten und den Platoon-Daten eine neue Geschwindigkeit zu ermitteln, die das eFZ anstrebt um die gegebenen IPD und PS herzustellen und um Ziehharmonika-Effekte und Kollisionen zu vermeiden. Dafür stehen dem eFZ alle fahrzeuginternen sowie die Platoon-Daten IPD und PS zur Verfügung.\\
Die ermittelte Geschwindigkeit wird dann an den einen Controller weiter gegeben, der diese stetig auf den Motor umsetzt.\\
\\
\textit{Versuchsaufbau}\\
- \subsection{Ansätze und Herausforderungen}
+ \subsubsection{Ansätze und Herausforderungen}
Dazu gab es direkt 2 Ansätze. Der erste ist eine 2-State-Machine, die abwechselnd zwischen \textit{IPD herstellen} und \textit{PS herstellen} schaltet.\\
\\
\textit{State-Machine}\\
@@ -124,7 +43,7 @@ while (True):
\end{align*}
Damit lässt sich $v_o^\prime = f(v_o, d_o, v_p, d_{IPD}, v_{PS})$ darstellen.
- \subsection{Lösung}
+ \subsubsection{Lösung}
Zunächst betrachtet man folgende 3 Ungleichungen
\begin{align*}
d_{IPD} - tol(IPD)\le &d_o \le d_{IPD} + tol(IPD)\\
@@ -154,12 +73,6 @@ while (True):
\\
Also lässt $v_o^\prime = f(v_o, d_o, v_p, d_{IPD}, v_{PS}) = g(d_o, v_p, d_{IPD}, v_{PS})$ ausdrücken, da die optimale Geschwindigkeit, nicht von der $v_o$ abhängt oder abhängen muss, da der nach geschaltete Controller eigenständig von der aktuellen Geschwindigkeit $v_o$ auf $v_o^\prime$ reguliert.
- \subsection{Validierung}
+ \subsubsection{Validierung}
- \subsection{Implementierung}
-
-
-\end{document}
-
-
-
+ \subsubsection{Implementierung}
diff --git a/doc/modules/cruiseControl/docCACC-standalone.tex b/doc/modules/cruiseControl/docCACC-standalone.tex
new file mode 100644
index 0000000000000000000000000000000000000000..8467d82b10281bd52c2a9f4215361bfa9dddfe54
--- /dev/null
+++ b/doc/modules/cruiseControl/docCACC-standalone.tex
@@ -0,0 +1,74 @@
+\documentclass[fleqn,a4paper,12pt]{article}
+\usepackage{geometry}
+\geometry{left=30mm, right=40mm, bottom=30mm}
+\usepackage[german]{babel}
+\usepackage[utf8]{inputenc} %Für Umlaute
+
+\usepackage{amsmath} % Mathematische Symbole
+\usepackage{amssymb} % Nochmehr mathematische Symbole
+\usepackage{stmaryrd} % Für die [[ ]] Klammern (\llbracket, \rrbracket)
+\usepackage{dsfont} % Schriftsatz fuer Zahlenmengensymbole
+%\usepackage{verbatim} % erweiterte Verbatim-Umgebung
+\usepackage{alltt} % Quasi-Verbatim-Umgebung
+\usepackage{fancyhdr} % Eigene Kopfzeilen
+\usepackage{graphics} % Zum Einbinden von Grafiken
+\usepackage{tikz} % Zur Erstellung von Graphen
+\usepackage{listings} % Pseudo-Code Formatierung
+% Einbinden einer eps-Grafik geht so: includegraphics{path}
+
+% Seitenraender
+\addtolength{\voffset}{-2cm}
+\addtolength{\textheight}{0cm}
+\addtolength{\hoffset}{0cm}
+\addtolength{\textwidth}{2cm}
+%\addtolength{\headheight}{2cm} % fuer jeden Strichkode einen Zentimeter
+
+% Skalierung der Grafiken
+\setlength{\unitlength}{1cm}
+
+\pagestyle{fancy} % Eigene Kopfzeilen verwenden
+\frenchspacing % Kein Extrafreiraum nach Satzzeichen
+\setlength{\parindent}{0pt} % Neue Absaetze nicht einruecken
+%\sloppy % Schlampige Absatzformatierung
+\fussy % Penible Absatzformatierung
+\linespread{1.5} % Zeilenabstand
+
+%tikz-definition
+\tikzstyle{rec} = [minimum width=1cm, minimum height=0.8cm, align = left,text centered, draw=black]
+
+% Kopfzeile
+%\lhead{}
+%\rhead{}
+\lstset{ %
+ %backgroundcolor=\color{}, % choose the background color; you must add \usepackage{color} or \usepackage{xcolor}; should come as last argument
+ basicstyle=\footnotesize, % the size of the fonts that are used for the code
+ breakatwhitespace=false, % sets if automatic breaks should only happen at whitespace
+ breaklines=true, % sets automatic line breaking
+ captionpos=b, % sets the caption-position to bottom
+ %commentstyle=\color{mygreen}, % comment style
+ %deletekeywords={...}, % if you want to delete keywords from the given language
+ escapeinside={\%*}{*)}, % if you want to add LaTeX within your code
+ extendedchars=true, % lets you use non-ASCII characters; for 8-bits encodings only, does not work with UTF-8
+ %frame=single, % adds a frame around the code
+ keepspaces=true, % keeps spaces in text, useful for keeping indentation of code (possibly needs columns=flexible)
+ keywordstyle=\color{blue}, % keyword style
+ language=Python, % the language of the code
+ %morekeywords={*,...}, % if you want to add more keywords to the set
+ numbers=left, % where to put the line-numbers; possible values are (none, left, right)
+ numbersep=5pt, % how far the line-numbers are from the code
+ numberstyle=\tiny,%\color{mygray}, % the style that is used for the line-numbers
+ %rulecolor=\color{black}, % if not set, the frame-color may be changed on line-breaks within not-black text (e.g. comments (green here))
+ showspaces=false, % show spaces everywhere adding particular underscores; it overrides 'showstringspaces'
+ showstringspaces=false, % underline spaces within strings only
+ showtabs=false, % show tabs within strings adding particular underscores
+ stepnumber=1, % the step between two line-numbers. If it's 1, each line will be numbered
+ stringstyle=\color{mymauve}, % string literal style
+ tabsize=2, % sets default tabsize to 2 spaces
+ title=\lstname % show the filename of files included with \lstinputlisting; also try caption instead of title
+}
+\begin{document}
+ \input{docCACC-content.tex}
+\end{document}
+
+
+
diff --git a/modules/CACC/kalmanfilter.py b/doc/modules/cruiseControl/kalmanfilter.py
similarity index 100%
rename from modules/CACC/kalmanfilter.py
rename to doc/modules/cruiseControl/kalmanfilter.py
diff --git a/modules/CACC/simlifiedSpeedVisualization.py b/doc/modules/cruiseControl/simlifiedSpeedVisualization.py
similarity index 100%
rename from modules/CACC/simlifiedSpeedVisualization.py
rename to doc/modules/cruiseControl/simlifiedSpeedVisualization.py
diff --git a/doc/modules/environment/docEnvironment-content.tex b/doc/modules/environment/docEnvironment-content.tex
new file mode 100644
index 0000000000000000000000000000000000000000..eb7ef2e37f53592355425158bda4675e989f1c91
--- /dev/null
+++ b/doc/modules/environment/docEnvironment-content.tex
@@ -0,0 +1,10 @@
+\subsection{Environment-Modul}
+ \subsubsection{Problembeschreibung und Einordnung}
+
+ \subsubsection{Ansätze und Herausforderungen}
+
+ \subsubsection{Lösung}
+
+ \subsubsection{Validierung}
+
+ \subsubsection{Implementierung}
diff --git a/doc/modules/environment/docEnvironment-standalone.tex b/doc/modules/environment/docEnvironment-standalone.tex
new file mode 100644
index 0000000000000000000000000000000000000000..33aa438f7408f0a91c4aec09bca1d61b3442a097
--- /dev/null
+++ b/doc/modules/environment/docEnvironment-standalone.tex
@@ -0,0 +1,74 @@
+\documentclass[fleqn,a4paper,12pt]{article}
+\usepackage{geometry}
+\geometry{left=30mm, right=40mm, bottom=30mm}
+\usepackage[german]{babel}
+\usepackage[utf8]{inputenc} %Für Umlaute
+
+\usepackage{amsmath} % Mathematische Symbole
+\usepackage{amssymb} % Nochmehr mathematische Symbole
+\usepackage{stmaryrd} % Für die [[ ]] Klammern (\llbracket, \rrbracket)
+\usepackage{dsfont} % Schriftsatz fuer Zahlenmengensymbole
+%\usepackage{verbatim} % erweiterte Verbatim-Umgebung
+\usepackage{alltt} % Quasi-Verbatim-Umgebung
+\usepackage{fancyhdr} % Eigene Kopfzeilen
+\usepackage{graphics} % Zum Einbinden von Grafiken
+\usepackage{tikz} % Zur Erstellung von Graphen
+\usepackage{listings} % Pseudo-Code Formatierung
+% Einbinden einer eps-Grafik geht so: includegraphics{path}
+
+% Seitenraender
+\addtolength{\voffset}{-2cm}
+\addtolength{\textheight}{0cm}
+\addtolength{\hoffset}{0cm}
+\addtolength{\textwidth}{2cm}
+%\addtolength{\headheight}{2cm} % fuer jeden Strichkode einen Zentimeter
+
+% Skalierung der Grafiken
+\setlength{\unitlength}{1cm}
+
+\pagestyle{fancy} % Eigene Kopfzeilen verwenden
+\frenchspacing % Kein Extrafreiraum nach Satzzeichen
+\setlength{\parindent}{0pt} % Neue Absaetze nicht einruecken
+%\sloppy % Schlampige Absatzformatierung
+\fussy % Penible Absatzformatierung
+\linespread{1.5} % Zeilenabstand
+
+%tikz-definition
+\tikzstyle{rec} = [minimum width=1cm, minimum height=0.8cm, align = left,text centered, draw=black]
+
+% Kopfzeile
+%\lhead{}
+%\rhead{}
+\lstset{ %
+ %backgroundcolor=\color{}, % choose the background color; you must add \usepackage{color} or \usepackage{xcolor}; should come as last argument
+ basicstyle=\footnotesize, % the size of the fonts that are used for the code
+ breakatwhitespace=false, % sets if automatic breaks should only happen at whitespace
+ breaklines=true, % sets automatic line breaking
+ captionpos=b, % sets the caption-position to bottom
+ %commentstyle=\color{mygreen}, % comment style
+ %deletekeywords={...}, % if you want to delete keywords from the given language
+ escapeinside={\%*}{*)}, % if you want to add LaTeX within your code
+ extendedchars=true, % lets you use non-ASCII characters; for 8-bits encodings only, does not work with UTF-8
+ %frame=single, % adds a frame around the code
+ keepspaces=true, % keeps spaces in text, useful for keeping indentation of code (possibly needs columns=flexible)
+ keywordstyle=\color{blue}, % keyword style
+ language=Python, % the language of the code
+ %morekeywords={*,...}, % if you want to add more keywords to the set
+ numbers=left, % where to put the line-numbers; possible values are (none, left, right)
+ numbersep=5pt, % how far the line-numbers are from the code
+ numberstyle=\tiny,%\color{mygray}, % the style that is used for the line-numbers
+ %rulecolor=\color{black}, % if not set, the frame-color may be changed on line-breaks within not-black text (e.g. comments (green here))
+ showspaces=false, % show spaces everywhere adding particular underscores; it overrides 'showstringspaces'
+ showstringspaces=false, % underline spaces within strings only
+ showtabs=false, % show tabs within strings adding particular underscores
+ stepnumber=1, % the step between two line-numbers. If it's 1, each line will be numbered
+ stringstyle=\color{mymauve}, % string literal style
+ tabsize=2, % sets default tabsize to 2 spaces
+ title=\lstname % show the filename of files included with \lstinputlisting; also try caption instead of title
+}
+\begin{document}
+ \input{docEnvironment-content.tex}
+\end{document}
+
+
+
diff --git a/modules/CACC/moduleCACC.pdf b/modules/CACC/moduleCACC.pdf
deleted file mode 100644
index 9be862f69c9ca3f2770069c1760408d97823343d..0000000000000000000000000000000000000000
Binary files a/modules/CACC/moduleCACC.pdf and /dev/null differ