diff options
Diffstat (limited to '')
5 files changed, 97 insertions, 24 deletions
diff --git a/doc/thesis/figures/data/qpsk_sim_dynamic_grblock_los_etsi_doppler5_k5.py b/doc/thesis/figures/data/qpsk_sim_dynamic_grblock_los_etsi_doppler5_k5.py index eae2afc..f621fd0 100644 --- a/doc/thesis/figures/data/qpsk_sim_dynamic_grblock_los_etsi_doppler5_k5.py +++ b/doc/thesis/figures/data/qpsk_sim_dynamic_grblock_los_etsi_doppler5_k5.py @@ -7,11 +7,11 @@ import numpy as np samples = utils.load_samples(__file__) # range of samples we want to show -start = 1e3 -end = start +800 +start = 5e3 +end = start +1e3 # select every second samples -select_samples = lambda arr: arr[int(start):int(end):4] +select_samples = lambda arr: arr[int(start):int(end):8] values = map(select_samples, samples) # split into imaginary and real parts diff --git a/doc/thesis/figures/data/qpsk_sim_dynamic_grblock_los_etsi_doppler70_k5.py b/doc/thesis/figures/data/qpsk_sim_dynamic_grblock_los_etsi_doppler70_k5.py index eae2afc..c82fbd1 100644 --- a/doc/thesis/figures/data/qpsk_sim_dynamic_grblock_los_etsi_doppler70_k5.py +++ b/doc/thesis/figures/data/qpsk_sim_dynamic_grblock_los_etsi_doppler70_k5.py @@ -8,10 +8,10 @@ samples = utils.load_samples(__file__) # range of samples we want to show start = 1e3 -end = start +800 +end = start +1e3 # select every second samples -select_samples = lambda arr: arr[int(start):int(end):4] +select_samples = lambda arr: arr[int(start):int(end):10] values = map(select_samples, samples) # split into imaginary and real parts diff --git a/doc/thesis/figures/data/qpsk_sim_dynamic_grblock_nlos_etsi_doppler5.py b/doc/thesis/figures/data/qpsk_sim_dynamic_grblock_nlos_etsi_doppler5.py index eae2afc..c82fbd1 100644 --- a/doc/thesis/figures/data/qpsk_sim_dynamic_grblock_nlos_etsi_doppler5.py +++ b/doc/thesis/figures/data/qpsk_sim_dynamic_grblock_nlos_etsi_doppler5.py @@ -8,10 +8,10 @@ samples = utils.load_samples(__file__) # range of samples we want to show start = 1e3 -end = start +800 +end = start +1e3 # select every second samples -select_samples = lambda arr: arr[int(start):int(end):4] +select_samples = lambda arr: arr[int(start):int(end):10] values = map(select_samples, samples) # split into imaginary and real parts diff --git a/doc/thesis/figures/tikz/qpsk-simulations-dynamic.tex b/doc/thesis/figures/tikz/qpsk-simulations-dynamic.tex index 5806d42..4d01c92 100644 --- a/doc/thesis/figures/tikz/qpsk-simulations-dynamic.tex +++ b/doc/thesis/figures/tikz/qpsk-simulations-dynamic.tex @@ -1,19 +1,83 @@ % vim: set ts=2 sw=2 noet: -\newcommand{\makeplot}[6]{% +\newcommand{\makeplot}[5]{% \hfill \begin{tikzpicture} \begin{axis}[ - width = {\linewidth / 3.5}, - height = {\linewidth / 3.5}, + width = {\linewidth / 3.3}, + height = {\linewidth / 3.3}, grid = major, xmin = {-#4}, xmax = {#4}, ymin = {-#4}, ymax = {#4}, + colormap name=viridis, #5 ] - \addplot[only marks, #6] table[x index = #2, y index = #3] {#1}; + \addplot[only marks, scatter] table [x index = #2, y index = #3] {#1}; \end{axis} \end{tikzpicture} \hfill } + +% ------------------------------------------------------------------- + +\noindent +\makeplot{figures/data/qpsk_sim_dynamic_grblock_nlos_etsi_doppler5.dat}{0}{1}{4}{ + ylabel = {Channel with ISI}, + yticklabel style = { + text width = 3em, + align = right, + }, + title = {NLOS, \(\Delta f = \SI{5}{\hertz}\)}, +} +% +\makeplot{figures/data/qpsk_sim_dynamic_grblock_los_etsi_doppler5_k5.dat}{0}{1}{4}{ + title = {LOS, \(\Delta f = \SI{5}{\hertz}, K = 5\)}, +} +% +\makeplot{figures/data/qpsk_sim_dynamic_grblock_los_etsi_doppler70_k5.dat}{0}{1}{4}{ + title = {LOS, \(\Delta f = \SI{70}{\hertz}, K = 5\)}, +} +\newline + +% ------------------------------------------------------------------- + +\noindent +\makeplot{figures/data/qpsk_sim_dynamic_grblock_nlos_etsi_doppler5.dat}{2}{3}{4}{% + ylabel = {Synchronized}, + yticklabel style = { + text width = 3em, + align = right, + }, +} +\makeplot{figures/data/qpsk_sim_dynamic_grblock_los_etsi_doppler5_k5.dat}{2}{3}{4}{} +\makeplot{figures/data/qpsk_sim_dynamic_grblock_los_etsi_doppler70_k5.dat}{2}{3}{4}{} +\newline + +% ------------------------------------------------------------------- + +\noindent +\makeplot{figures/data/qpsk_sim_dynamic_grblock_nlos_etsi_doppler5.dat}{4}{5}{2}{% + ylabel = {Equalized}, + yticklabel style = { + text width = 3em, + align = right, + }, +} +\makeplot{figures/data/qpsk_sim_dynamic_grblock_los_etsi_doppler5_k5.dat}{4}{5}{2}{} +\makeplot{figures/data/qpsk_sim_dynamic_grblock_los_etsi_doppler70_k5.dat}{4}{5}{2}{} +\newline + +% ------------------------------------------------------------------- + +\noindent +\makeplot{figures/data/qpsk_sim_dynamic_grblock_nlos_etsi_doppler5.dat}{6}{7}{2}{% + ylabel = {Locked}, + yticklabel style = { + text width = 3em, + align = right, + }, +} +\makeplot{figures/data/qpsk_sim_dynamic_grblock_los_etsi_doppler5_k5.dat}{6}{7}{2}{} +\makeplot{figures/data/qpsk_sim_dynamic_grblock_los_etsi_doppler70_k5.dat}{6}{7}{2}{} +\newline diff --git a/doc/thesis/figures/tikz/qpsk-simulations-static.tex b/doc/thesis/figures/tikz/qpsk-simulations-static.tex index ebe7957..1afb134 100644 --- a/doc/thesis/figures/tikz/qpsk-simulations-static.tex +++ b/doc/thesis/figures/tikz/qpsk-simulations-static.tex @@ -1,11 +1,10 @@ % vim: set ts=2 sw=2 noet: - \newcommand{\makeplot}[6]{% \hfill \begin{tikzpicture} \begin{axis}[ - width = {\linewidth / 3.5}, - height = {\linewidth / 3.5}, + width = {\linewidth / 3.3}, + height = {\linewidth / 3.3}, grid = major, xmin = {-#4}, xmax = {#4}, ymin = {-#4}, ymax = {#4}, @@ -18,28 +17,34 @@ \hfill } +% ------------------------------------------------------------------- + \noindent \makeplot{figures/data/qpsk_sim_static_firblock_nlos_halfsymb.dat}{0}{1}{4}{ ylabel = {Channel with ISI}, yticklabel style = { - text width = 2.25em, + text width = 3em, align = right, }, title = {1 Tap NLOS}, }{magenta!80!blue} +% \makeplot{figures/data/qpsk_sim_static_firblock_los_halfsymb.dat}{0}{1}{4}{ title = {1 Tap LOS}, }{magenta!80!blue} +% \makeplot{figures/data/qpsk_sim_static_firblock_los_vec.dat}{0}{1}{4}{ title = {4 Taps LOS}, }{magenta!80!blue} \newline +% ------------------------------------------------------------------- + \noindent \makeplot{figures/data/qpsk_sim_static_firblock_nlos_halfsymb.dat}{2}{3}{4}{% ylabel = {Synchronized}, yticklabel style = { - text width = 2.25em, + text width = 3em, align = right, }, }{magenta!60!blue} @@ -47,27 +52,31 @@ \makeplot{figures/data/qpsk_sim_static_firblock_los_vec.dat}{2}{3}{4}{}{magenta!60!blue} \newline +% ------------------------------------------------------------------- + \noindent -\makeplot{figures/data/qpsk_sim_static_firblock_nlos_halfsymb.dat}{4}{5}{1}{% +\makeplot{figures/data/qpsk_sim_static_firblock_nlos_halfsymb.dat}{4}{5}{2}{% ylabel = {Equalized}, yticklabel style = { - text width = 2.25em, + text width = 3em, align = right, }, }{magenta!40!blue} -\makeplot{figures/data/qpsk_sim_static_firblock_los_halfsymb.dat}{4}{5}{1}{}{magenta!40!blue} -\makeplot{figures/data/qpsk_sim_static_firblock_los_vec.dat}{4}{5}{1}{}{magenta!40!blue} +\makeplot{figures/data/qpsk_sim_static_firblock_los_halfsymb.dat}{4}{5}{2}{}{magenta!40!blue} +\makeplot{figures/data/qpsk_sim_static_firblock_los_vec.dat}{4}{5}{2}{}{magenta!40!blue} \newline +% ------------------------------------------------------------------- + \noindent -\makeplot{figures/data/qpsk_sim_static_firblock_nlos_halfsymb.dat}{6}{7}{1}{% +\makeplot{figures/data/qpsk_sim_static_firblock_nlos_halfsymb.dat}{6}{7}{2}{% ylabel = {Locked}, yticklabel style = { - text width = 2.25em, + text width = 3em, align = right, }, }{magenta!20!blue} -\makeplot{figures/data/qpsk_sim_static_firblock_los_halfsymb.dat}{6}{7}{1}{}{magenta!20!blue} -\makeplot{figures/data/qpsk_sim_static_firblock_los_vec.dat}{6}{7}{1}{}{magenta!20!blue} +\makeplot{figures/data/qpsk_sim_static_firblock_los_halfsymb.dat}{6}{7}{2}{}{magenta!20!blue} +\makeplot{figures/data/qpsk_sim_static_firblock_los_vec.dat}{6}{7}{2}{}{magenta!20!blue} \newline |