aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/thesis/Makefile4
-rw-r--r--doc/thesis/chapters/implementation.tex40
-rw-r--r--doc/thesis/figures/data/qpsk_sim_constellations_without_effects.py (renamed from doc/thesis/figures/data/qpsk_sim_constellations_whitout_effects.py)0
-rw-r--r--doc/thesis/figures/tikz/qpsk-sim-constellations-without-effects.tex (renamed from doc/thesis/figures/tikz/qpsk-sim-constellations-whitout-effects.tex)8
4 files changed, 22 insertions, 30 deletions
diff --git a/doc/thesis/Makefile b/doc/thesis/Makefile
index a392083..789efed 100644
--- a/doc/thesis/Makefile
+++ b/doc/thesis/Makefile
@@ -28,14 +28,14 @@ SOURCES := \
figures/tikz/packet-frame.tex \
figures/tikz/qpsk-sim-constellations-static.tex \
figures/tikz/qpsk-sim-constellations-dynamic.tex\
- figures/tikz/qpsk-sim-constellations-whitout-effects.tex\
+ figures/tikz/qpsk-sim-constellations-without-effects.tex\
DATA := \
figures/data/multipath_frequency_response.dat \
figures/data/qpsk_sim_constellations_static.dat \
figures/data/qpsk_sim_constellations_static_symb.dat \
figures/data/qpsk_sim_constellations_dynamic.dat\
- figures/data/qpsk_sim_constellations_whitout_effects.dat \
+ figures/data/qpsk_sim_constellations_without_effects.dat \
figures/data/rice_pdf.dat
diff --git a/doc/thesis/chapters/implementation.tex b/doc/thesis/chapters/implementation.tex
index 7be6763..aa394bf 100644
--- a/doc/thesis/chapters/implementation.tex
+++ b/doc/thesis/chapters/implementation.tex
@@ -280,35 +280,27 @@ In order to study the effects of multipath fading, a series of simulations have
\begin{figure}
\centering
- \input{figures/tikz/qpsk-sim-constellations-whitout-effects}
+ \input{figures/tikz/qpsk-sim-constellations-without-effects}
+ \caption{
+ TODO
+ }
+\end{figure}
+
+\begin{figure}
+ \centering
+ \input{figures/tikz/qpsk-sim-constellations-static}
\caption{
Constellation diagrams for a simulated link using QPSK with AWGN and Rayleighan fading.
}
\end{figure}
-%\begin{figure}
-% \centering
-% \input{figures/tikz/qpsk-sim-constellations-static}
-% \caption{
-% Constellation diagrams for a simulated link using QPSK with AWGN and Rayleighan fading.
-% }
-%\end{figure}
-
-%\begin{figure}
-% \centering
-% \input{figures/tikz/qpsk-sim-constellations-static-symb}
-% \caption{
-% Constellation diagrams for a simulated link using QPSK with the discrete time model block.
-% }
-%\end{figure}
-%
-%\begin{figure}
-% \centering
-% \input{figures/tikz/qpsk-sim-constellations-dynamic}
-% \caption{
-% Constellation diagrams for a simulated link using QPSK with AWGN and Rayleighan fading. The paramters are: frequency offset of 0.2 \%, \SI{100}{\milli\volt} noise, dopper shift for \(v = \SI{2}{\meter\per\second}\), and a NLOS urban PDP.
-% }
-%\end{figure}
+\begin{figure}
+ \centering
+ \input{figures/tikz/qpsk-sim-constellations-dynamic}
+ \caption{
+ Constellation diagrams for a simulated link using QPSK with AWGN and Rayleighan fading. The paramters are: frequency offset of 0.2 \%, \SI{100}{\milli\volt} noise, dopper shift for \(v = \SI{2}{\meter\per\second}\), and a NLOS urban PDP.
+ }
+\end{figure}
\subsection{Fading with discrete time model}
diff --git a/doc/thesis/figures/data/qpsk_sim_constellations_whitout_effects.py b/doc/thesis/figures/data/qpsk_sim_constellations_without_effects.py
index 3ac9948..3ac9948 100644
--- a/doc/thesis/figures/data/qpsk_sim_constellations_whitout_effects.py
+++ b/doc/thesis/figures/data/qpsk_sim_constellations_without_effects.py
diff --git a/doc/thesis/figures/tikz/qpsk-sim-constellations-whitout-effects.tex b/doc/thesis/figures/tikz/qpsk-sim-constellations-without-effects.tex
index 6e659cb..0c33019 100644
--- a/doc/thesis/figures/tikz/qpsk-sim-constellations-whitout-effects.tex
+++ b/doc/thesis/figures/tikz/qpsk-sim-constellations-without-effects.tex
@@ -15,7 +15,7 @@
]
\addplot[magenta, only marks] table[x index = 0, y index = 1]
- {figures/data/qpsk_sim_constellations_whitout_effects.dat};
+ {figures/data/qpsk_sim_constellations_without_effects.dat};
\end{axis}
\end{tikzpicture}
\end{subfigure}
@@ -35,7 +35,7 @@
]
\addplot[magenta!80!blue, only marks] table[x index = 2, y index = 3]
- {figures/data/qpsk_sim_constellations_whitout_effects.dat};
+ {figures/data/qpsk_sim_constellations_without_effects.dat};
\end{axis}
\end{tikzpicture}
\end{subfigure}
@@ -59,7 +59,7 @@
]
\addplot[magenta!50!blue, only marks] table[x index = 4, y index = 5]
- {figures/data/qpsk_sim_constellations_whitout_effects.dat};
+ {figures/data/qpsk_sim_constellations_without_effects.dat};
\end{axis}
\end{tikzpicture}
\end{subfigure}
@@ -79,7 +79,7 @@
]
\addplot[magenta!30!blue, only marks] table[x index = 6, y index = 7]
- {figures/data/qpsk_sim_constellations_whitout_effects.dat};
+ {figures/data/qpsk_sim_constellations_without_effects.dat};
\end{axis}
\end{tikzpicture}
\end{subfigure}