From 63981af99da344c4b736ca5740179ec24a3d6d2d Mon Sep 17 00:00:00 2001 From: Nao Pross Date: Sat, 18 Dec 2021 16:00:10 +0100 Subject: Reorganize plots --- .../figures/tikz/qpsk-simulations-static.tex | 77 ++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 doc/thesis/figures/tikz/qpsk-simulations-static.tex (limited to 'doc/thesis/figures/tikz/qpsk-simulations-static.tex') diff --git a/doc/thesis/figures/tikz/qpsk-simulations-static.tex b/doc/thesis/figures/tikz/qpsk-simulations-static.tex new file mode 100644 index 0000000..b2453a4 --- /dev/null +++ b/doc/thesis/figures/tikz/qpsk-simulations-static.tex @@ -0,0 +1,77 @@ +% vim: set ts=2 sw=2 noet: + +\newcommand{\makeplot}[6]{% + \hfill + \begin{tikzpicture} + \begin{axis}[ + width = {\linewidth / 3.5}, + height = {\linewidth / 3.5}, + grid = major, + xmin = {-#4}, xmax = {#4}, + ymin = {-#4}, ymax = {#4}, + #5 + ] + + \addplot[only marks, #6] table[x index = #2, y index = #3] {#1}; + \end{axis} + \end{tikzpicture} + \hfill +} + +\noindent +% \makeplot{figures/data/qpsk_sim_constellations_without_effects.dat}{0}{1}{4}{} +% \makeplot{figures/data/qpsk_sim_constellations_static.dat}{0}{1}{4}{} +\makeplot{figures/data/qpsk_sim_constellations_static_symb.dat}{0}{1}{4}{ + ylabel = {Channel with ISI}, + yticklabel style = { + text width = 2.25em, + align = right, + }, + title = {}, +}{magenta} +\makeplot{figures/data/qpsk_sim_constellations_static_symb_vec.dat}{0}{1}{4}{title = {},}{magenta} +\makeplot{figures/data/qpsk_sim_constellations_static_symb_NLOS.dat}{0}{1}{4}{title = {},}{magenta} +\newline + +\noindent +% \makeplot{figures/data/qpsk_sim_constellations_without_effects.dat}{2}{3}{4}{} +% \makeplot{figures/data/qpsk_sim_constellations_static.dat}{2}{3}{4}{} +\makeplot{figures/data/qpsk_sim_constellations_static_symb.dat}{2}{3}{4}{% + ylabel = {Synchronized}, + yticklabel style = { + text width = 2.25em, + align = right, + }, +}{magenta!80!blue} +\makeplot{figures/data/qpsk_sim_constellations_static_symb_vec.dat}{2}{3}{4}{}{magenta!80!blue} +\makeplot{figures/data/qpsk_sim_constellations_static_symb_NLOS.dat}{2}{3}{4}{}{magenta!80!blue} +\newline + +\noindent +% \makeplot{figures/data/qpsk_sim_constellations_without_effects.dat}{4}{5}{1}{} +% \makeplot{figures/data/qpsk_sim_constellations_static.dat}{4}{5}{1}{} +\makeplot{figures/data/qpsk_sim_constellations_static_symb.dat}{4}{5}{1}{% + ylabel = {Equalized}, + yticklabel style = { + text width = 2.25em, + align = right, + }, +}{magenta!60!blue} +\makeplot{figures/data/qpsk_sim_constellations_static_symb_vec.dat}{4}{5}{1}{}{magenta!60!blue} +\makeplot{figures/data/qpsk_sim_constellations_static_symb_NLOS.dat}{4}{5}{1}{}{magenta!60!blue} +\newline + +\noindent +% \makeplot{figures/data/qpsk_sim_constellations_without_effects.dat}{6}{7}{1}{} +% \makeplot{figures/data/qpsk_sim_constellations_static.dat}{6}{7}{1}{} +\makeplot{figures/data/qpsk_sim_constellations_static_symb.dat}{6}{7}{1}{% + ylabel = {Locked}, + yticklabel style = { + text width = 2.25em, + align = right, + }, +}{magenta!40!blue} +\makeplot{figures/data/qpsk_sim_constellations_static_symb_vec.dat}{6}{7}{1}{}{magenta!40!blue} +\makeplot{figures/data/qpsk_sim_constellations_static_symb_NLOS.dat}{6}{7}{1}{}{magenta!40!blue} +\newline + -- cgit v1.2.1 From 3a076cc5f308d7f67ce0a2033b99cff6b841d75c Mon Sep 17 00:00:00 2001 From: Nao Pross Date: Sat, 18 Dec 2021 16:44:44 +0100 Subject: Rename flowgraph data files and remove static simulations --- .../figures/tikz/qpsk-simulations-static.tex | 32 ++++++++-------------- 1 file changed, 12 insertions(+), 20 deletions(-) (limited to 'doc/thesis/figures/tikz/qpsk-simulations-static.tex') diff --git a/doc/thesis/figures/tikz/qpsk-simulations-static.tex b/doc/thesis/figures/tikz/qpsk-simulations-static.tex index b2453a4..830b9af 100644 --- a/doc/thesis/figures/tikz/qpsk-simulations-static.tex +++ b/doc/thesis/figures/tikz/qpsk-simulations-static.tex @@ -19,9 +19,7 @@ } \noindent -% \makeplot{figures/data/qpsk_sim_constellations_without_effects.dat}{0}{1}{4}{} -% \makeplot{figures/data/qpsk_sim_constellations_static.dat}{0}{1}{4}{} -\makeplot{figures/data/qpsk_sim_constellations_static_symb.dat}{0}{1}{4}{ +\makeplot{figures/data/qpsk_sim_const_static_firblock_nlos_halfsymb.dat}{0}{1}{4}{ ylabel = {Channel with ISI}, yticklabel style = { text width = 2.25em, @@ -29,49 +27,43 @@ }, title = {}, }{magenta} -\makeplot{figures/data/qpsk_sim_constellations_static_symb_vec.dat}{0}{1}{4}{title = {},}{magenta} -\makeplot{figures/data/qpsk_sim_constellations_static_symb_NLOS.dat}{0}{1}{4}{title = {},}{magenta} +\makeplot{figures/data/qpsk_sim_const_static_firblock_los_halfsymb.dat}{0}{1}{4}{title = {},}{magenta} +\makeplot{figures/data/qpsk_sim_const_static_firblock_los_vec.dat}{0}{1}{4}{title = {},}{magenta} \newline \noindent -% \makeplot{figures/data/qpsk_sim_constellations_without_effects.dat}{2}{3}{4}{} -% \makeplot{figures/data/qpsk_sim_constellations_static.dat}{2}{3}{4}{} -\makeplot{figures/data/qpsk_sim_constellations_static_symb.dat}{2}{3}{4}{% +\makeplot{figures/data/qpsk_sim_const_static_firblock_nlos_halfsymb.dat}{2}{3}{4}{% ylabel = {Synchronized}, yticklabel style = { text width = 2.25em, align = right, }, }{magenta!80!blue} -\makeplot{figures/data/qpsk_sim_constellations_static_symb_vec.dat}{2}{3}{4}{}{magenta!80!blue} -\makeplot{figures/data/qpsk_sim_constellations_static_symb_NLOS.dat}{2}{3}{4}{}{magenta!80!blue} +\makeplot{figures/data/qpsk_sim_const_static_firblock_los_halfsymb.dat}{2}{3}{4}{}{magenta!80!blue} +\makeplot{figures/data/qpsk_sim_const_static_firblock_los_vec.dat}{2}{3}{4}{}{magenta!80!blue} \newline \noindent -% \makeplot{figures/data/qpsk_sim_constellations_without_effects.dat}{4}{5}{1}{} -% \makeplot{figures/data/qpsk_sim_constellations_static.dat}{4}{5}{1}{} -\makeplot{figures/data/qpsk_sim_constellations_static_symb.dat}{4}{5}{1}{% +\makeplot{figures/data/qpsk_sim_const_static_firblock_nlos_halfsymb.dat}{4}{5}{1}{% ylabel = {Equalized}, yticklabel style = { text width = 2.25em, align = right, }, }{magenta!60!blue} -\makeplot{figures/data/qpsk_sim_constellations_static_symb_vec.dat}{4}{5}{1}{}{magenta!60!blue} -\makeplot{figures/data/qpsk_sim_constellations_static_symb_NLOS.dat}{4}{5}{1}{}{magenta!60!blue} +\makeplot{figures/data/qpsk_sim_const_static_firblock_los_halfsymb.dat}{4}{5}{1}{}{magenta!60!blue} +\makeplot{figures/data/qpsk_sim_const_static_firblock_los_vec.dat}{4}{5}{1}{}{magenta!60!blue} \newline \noindent -% \makeplot{figures/data/qpsk_sim_constellations_without_effects.dat}{6}{7}{1}{} -% \makeplot{figures/data/qpsk_sim_constellations_static.dat}{6}{7}{1}{} -\makeplot{figures/data/qpsk_sim_constellations_static_symb.dat}{6}{7}{1}{% +\makeplot{figures/data/qpsk_sim_const_static_firblock_nlos_halfsymb.dat}{6}{7}{1}{% ylabel = {Locked}, yticklabel style = { text width = 2.25em, align = right, }, }{magenta!40!blue} -\makeplot{figures/data/qpsk_sim_constellations_static_symb_vec.dat}{6}{7}{1}{}{magenta!40!blue} -\makeplot{figures/data/qpsk_sim_constellations_static_symb_NLOS.dat}{6}{7}{1}{}{magenta!40!blue} +\makeplot{figures/data/qpsk_sim_const_static_firblock_los_halfsymb.dat}{6}{7}{1}{}{magenta!40!blue} +\makeplot{figures/data/qpsk_sim_const_static_firblock_los_vec.dat}{6}{7}{1}{}{magenta!40!blue} \newline -- cgit v1.2.1 From 42847d93ef34cfdeb55ba1949e904a8e7148265b Mon Sep 17 00:00:00 2001 From: Nao Pross Date: Sat, 18 Dec 2021 18:25:49 +0100 Subject: Add static simulations --- .../figures/tikz/qpsk-simulations-static.tex | 38 ++++++++++++---------- 1 file changed, 21 insertions(+), 17 deletions(-) (limited to 'doc/thesis/figures/tikz/qpsk-simulations-static.tex') diff --git a/doc/thesis/figures/tikz/qpsk-simulations-static.tex b/doc/thesis/figures/tikz/qpsk-simulations-static.tex index 830b9af..ebe7957 100644 --- a/doc/thesis/figures/tikz/qpsk-simulations-static.tex +++ b/doc/thesis/figures/tikz/qpsk-simulations-static.tex @@ -19,51 +19,55 @@ } \noindent -\makeplot{figures/data/qpsk_sim_const_static_firblock_nlos_halfsymb.dat}{0}{1}{4}{ +\makeplot{figures/data/qpsk_sim_static_firblock_nlos_halfsymb.dat}{0}{1}{4}{ ylabel = {Channel with ISI}, yticklabel style = { text width = 2.25em, align = right, }, - title = {}, -}{magenta} -\makeplot{figures/data/qpsk_sim_const_static_firblock_los_halfsymb.dat}{0}{1}{4}{title = {},}{magenta} -\makeplot{figures/data/qpsk_sim_const_static_firblock_los_vec.dat}{0}{1}{4}{title = {},}{magenta} + 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_const_static_firblock_nlos_halfsymb.dat}{2}{3}{4}{% +\makeplot{figures/data/qpsk_sim_static_firblock_nlos_halfsymb.dat}{2}{3}{4}{% ylabel = {Synchronized}, yticklabel style = { text width = 2.25em, align = right, }, -}{magenta!80!blue} -\makeplot{figures/data/qpsk_sim_const_static_firblock_los_halfsymb.dat}{2}{3}{4}{}{magenta!80!blue} -\makeplot{figures/data/qpsk_sim_const_static_firblock_los_vec.dat}{2}{3}{4}{}{magenta!80!blue} +}{magenta!60!blue} +\makeplot{figures/data/qpsk_sim_static_firblock_los_halfsymb.dat}{2}{3}{4}{}{magenta!60!blue} +\makeplot{figures/data/qpsk_sim_static_firblock_los_vec.dat}{2}{3}{4}{}{magenta!60!blue} \newline \noindent -\makeplot{figures/data/qpsk_sim_const_static_firblock_nlos_halfsymb.dat}{4}{5}{1}{% +\makeplot{figures/data/qpsk_sim_static_firblock_nlos_halfsymb.dat}{4}{5}{1}{% ylabel = {Equalized}, yticklabel style = { text width = 2.25em, align = right, }, -}{magenta!60!blue} -\makeplot{figures/data/qpsk_sim_const_static_firblock_los_halfsymb.dat}{4}{5}{1}{}{magenta!60!blue} -\makeplot{figures/data/qpsk_sim_const_static_firblock_los_vec.dat}{4}{5}{1}{}{magenta!60!blue} +}{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} \newline \noindent -\makeplot{figures/data/qpsk_sim_const_static_firblock_nlos_halfsymb.dat}{6}{7}{1}{% +\makeplot{figures/data/qpsk_sim_static_firblock_nlos_halfsymb.dat}{6}{7}{1}{% ylabel = {Locked}, yticklabel style = { text width = 2.25em, align = right, }, -}{magenta!40!blue} -\makeplot{figures/data/qpsk_sim_const_static_firblock_los_halfsymb.dat}{6}{7}{1}{}{magenta!40!blue} -\makeplot{figures/data/qpsk_sim_const_static_firblock_los_vec.dat}{6}{7}{1}{}{magenta!40!blue} +}{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} \newline -- cgit v1.2.1