arma-thesis

git clone https://git.igankevich.com/arma-thesis.git
Log | Files | Refs | LICENSE

commit 9213916d551fcbe7584a514b121a9bc6009a8248
parent ce509a52ab8ea842e0be734b7f27135c0a113324
Author: Ivan Gankevich <igankevich@ya.ru>
Date:   Sun,  8 Jan 2017 14:57:09 +0300

Get rid of gnuplot graphs in favour of R.

Diffstat:
R/common.R | 24++++++++++++++++++++++++
phd-diss.org | 47++++++++++++-----------------------------------
2 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/R/common.R b/R/common.R @@ -6,3 +6,27 @@ arma.qqplot_grid <- function (dir, params) { arma.qqplot(wave_params[[name]]) } } + +arma.wavy_plot <- function (data, t, ...) { + slice <- data[data$t == t,] + x <- unique(slice$x) + y <- unique(slice$y) + z <- with(slice, { + n <- sqrt(length(z)) + out <- matrix(nrow=n, ncol=n) + out[cbind(x, y)] <- z + out + }) + nrz <- nrow(z) + ncz <- ncol(z) + # Create a function interpolating colors in the range of specified colors + jet.colors <- colorRampPalette( c("blue", "green") ) + # Generate the desired number of colors from this palette + nbcol <- 100 + color <- jet.colors(nbcol) + # Compute the z-value at the facet centres + zfacet <- z[-1, -1] + z[-1, -ncz] + z[-nrz, -1] + z[-nrz, -ncz] + # Recode facet z-values into color indices + facetcol <- cut(zfacet, nbcol) + persp(x, y, z, phi=30, theta=30, col=color[facetcol], ...) +} diff --git a/phd-diss.org b/phd-diss.org @@ -1374,8 +1374,7 @@ every possible wave from realisation since they may (and often) overlap. Verification was performed for standing and propagating waves. The corresponding ACFs and quantile-quantile plots of wave characteristics distributions are shown -in fig. [[fig:acf-plots]], [[standing-wave-distributions]], -[[propagating-wave-distributions]]. +in fig. [[acf-slices]], [[standing-wave-distributions]], [[propagating-wave-distributions]]. #+name: propagating-wave-distributions #+begin_src R :results output graphics :exports results :file build/propagating-wave-qqplots.pdf @@ -1405,43 +1404,21 @@ arma.qqplot_grid( #+RESULTS: standing-wave-distributions [[file:build/standing-wave-qqplots.pdf]] -#+begin_src gnuplot :exports none :output-dir build -# set absolute loadpath and go to build directory -set loadpath GPVAL_PWD."/gnuplot" GPVAL_PWD."/data/verification" -system "mkdir -p build" -cd "build" - -# ACFs of standing and propagating waves -sx=300 -sy=200 -outext='svg' -# Standing wave ACF -do for [i=0:4] { - reset - infile="standing-acf-" . i - load "acf.gnuplot" - system "inkscape --without-gui --export-eps=" . infile . ".eps " . infile . ".svg" -} -# Propagating wave ACF -do for [i=0:4] { - reset - infile="propagating-acf-0" . i - load "acf.gnuplot" - system "inkscape --without-gui --export-eps=" . infile . ".eps " . infile . ".svg" +#+name: acf-slices +#+begin_src R :results output graphics :exports results :file build/acf-slices.pdf +source(file.path("R", "common.R")) +propagating_acf <- read.csv(file.path("build", "propagating_wave", "acf.csv")) +standing_acf <- read.csv(file.path("build", "standing_wave", "acf.csv")) +par(mfrow=c(5, 2), mar=c(0,0,0,0)) +for (i in seq(0, 4)) { + arma.wavy_plot(propagating_acf, i, zlim=c(-5,5)) + arma.wavy_plot(standing_acf, i, zlim=c(-5,5)) } -exit #+end_src -#+RESULTS: - #+caption: Time slices of ACF function for standing (left column) and propagating waves (right column). -#+name: fig:acf-plots -| \includegraphics{standing-acf-0} | \includegraphics{propagating-acf-00} | -| \includegraphics{standing-acf-1} | \includegraphics{propagating-acf-01} | -| \includegraphics{standing-acf-2} | \includegraphics{propagating-acf-02} | -| \includegraphics{standing-acf-3} | \includegraphics{propagating-acf-03} | -| \includegraphics{standing-acf-4} | \includegraphics{propagating-acf-04} | - +#+RESULTS: acf-slices +[[file:build/acf-slices.pdf]] *** TODO Discuss graphs *** Verification of velocity potential fields