From 6ad4e443b662e8c61b1b350d3e639e821a8ff764 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Sat, 24 Oct 2020 01:42:54 +0200 Subject: Improve plot layout --- docs/dev/pkgdown.yml | 2 +- docs/dev/reference/Rplot002.png | Bin 63682 -> 64132 bytes docs/dev/reference/plot.nlme.mmkin-2.png | Bin 177237 -> 179274 bytes docs/dev/reference/plot.nlme.mmkin.html | 21 +++++---------------- 4 files changed, 6 insertions(+), 17 deletions(-) (limited to 'docs') diff --git a/docs/dev/pkgdown.yml b/docs/dev/pkgdown.yml index 8c97cd7c..61fa6e5d 100644 --- a/docs/dev/pkgdown.yml +++ b/docs/dev/pkgdown.yml @@ -10,7 +10,7 @@ articles: web_only/NAFTA_examples: NAFTA_examples.html web_only/benchmarks: benchmarks.html web_only/compiled_models: compiled_models.html -last_built: 2020-10-23T22:30Z +last_built: 2020-10-23T23:38Z urls: reference: https://pkgdown.jrwb.de/mkin/reference article: https://pkgdown.jrwb.de/mkin/articles diff --git a/docs/dev/reference/Rplot002.png b/docs/dev/reference/Rplot002.png index 71c768bd..cffa10c1 100644 Binary files a/docs/dev/reference/Rplot002.png and b/docs/dev/reference/Rplot002.png differ diff --git a/docs/dev/reference/plot.nlme.mmkin-2.png b/docs/dev/reference/plot.nlme.mmkin-2.png index 57128ade..4ec26146 100644 Binary files a/docs/dev/reference/plot.nlme.mmkin-2.png and b/docs/dev/reference/plot.nlme.mmkin-2.png differ diff --git a/docs/dev/reference/plot.nlme.mmkin.html b/docs/dev/reference/plot.nlme.mmkin.html index f17a23e3..c633e15a 100644 --- a/docs/dev/reference/plot.nlme.mmkin.html +++ b/docs/dev/reference/plot.nlme.mmkin.html @@ -151,11 +151,10 @@ plot( x, i = 1:ncol(x$mmkin_orig), - main = rownames(x$mmkin_orig), + main = NULL, obs_vars = names(x$mkinmod$map), standardized = TRUE, xlab = "Time", - ylab = "Observed", xlim = range(x$data$time), legends = 1, lpos = "topright", @@ -163,8 +162,7 @@ resplot = c("predicted", "time"), ymax = "auto", maxabs = "auto", - cex = 0.7, - rel.height.middle = 0.9, + rel.height.bottom = 1.1, pch_ds = 1:length(i), col_ds = pch_ds + 1, lty_ds = col_ds, @@ -203,10 +201,6 @@ variables in the model.

xlab

Label for the x axis.

- - ylab -

Label for the y axis.

- xlim

Plot range in x direction.

@@ -240,13 +234,8 @@ predicted values?

scaling of the y axis and defaults to "auto".

- cex -

Passed to the plot functions and mtext.

- - - rel.height.middle -

The relative height of the middle plot, if more -than two rows of plots are shown.

+ rel.height.bottom +

The relative height of the bottom plot row

pch_ds @@ -290,7 +279,7 @@ corresponding model prediction lines for the different datasets.

library(nlme) # For this fit we need to increase pnlsMaxiter, and we increase the # tolerance in order to speed up the fit for this example evaluation -f_nlme <- nlme(f, control = list(pnlsMaxIter = 120, tolerance = 1e-4)) +f_nlme <- nlme(f, control = list(pnlsMaxIter = 120, tolerance = 1e-3)) plot(f_nlme)
-- cgit v1.2.1