From e6f968cf97ed6ca9268e6098d86ba63ff2c6d2b0 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Wed, 24 May 2017 16:07:35 +0200 Subject: Fix for the sawtooth function for repeated applications For n > 2, the second application was made at 2 * i instead of i. --- R/twa.R | 2 +- docs/reference/PELMO_runs.html | 2 +- docs/reference/plot.one_box-4.png | Bin 10742 -> 10688 bytes docs/reference/plot.one_box-8.png | Bin 13953 -> 12575 bytes docs/reference/sawtooth-6.png | Bin 13953 -> 12575 bytes docs/reference/sawtooth.html | 10 +++++----- man/sawtooth.Rd | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/R/twa.R b/R/twa.R index 0cece29..ace7656 100644 --- a/R/twa.R +++ b/R/twa.R @@ -195,7 +195,7 @@ plot.one_box <- function(x, #' #' max_twa(pred_2_saw) sawtooth <- function(x, n = 1, i = 365, - applications = data.frame(time = seq(0, 0 + n * i, length.out = n), + applications = data.frame(time = seq(0, (n - 1) * i, length.out = n), amount = 1)) { n_obs = ncol(as.matrix(x)) diff --git a/docs/reference/PELMO_runs.html b/docs/reference/PELMO_runs.html index 3b64c6e..25afcf0 100644 --- a/docs/reference/PELMO_runs.html +++ b/docs/reference/PELMO_runs.html @@ -190,7 +190,7 @@ the period.plm file generated by the FOCUS PELMO GUI.

#> #>
# We get exactly the same PECgw values (on Linux, calling PELMO using Wine). print(time_1)
#> User System verstrichen -#> 219.860 0.960 55.449
+#> 218.736 0.940 54.948
# Demonstrate some results with metabolites. runs_2 <- list(list(psm = 'Pesticide_D_1_May_every_other_year_mets', win = c("Cha", "Ham", "Kre"))) diff --git a/docs/reference/plot.one_box-4.png b/docs/reference/plot.one_box-4.png index 1a1a7c6..06b2cde 100644 Binary files a/docs/reference/plot.one_box-4.png and b/docs/reference/plot.one_box-4.png differ diff --git a/docs/reference/plot.one_box-8.png b/docs/reference/plot.one_box-8.png index aa74981..3ff6e8a 100644 Binary files a/docs/reference/plot.one_box-8.png and b/docs/reference/plot.one_box-8.png differ diff --git a/docs/reference/sawtooth-6.png b/docs/reference/sawtooth-6.png index aa74981..3ff6e8a 100644 Binary files a/docs/reference/sawtooth-6.png and b/docs/reference/sawtooth-6.png differ diff --git a/docs/reference/sawtooth.html b/docs/reference/sawtooth.html index 0d5c9a9..ce528e6 100644 --- a/docs/reference/sawtooth.html +++ b/docs/reference/sawtooth.html @@ -77,8 +77,8 @@ application pattern specified in applications is repeated ni.

- 
sawtooth(x, n = 1, i = 365, applications = data.frame(time = seq(0, 0 + n
-  * i, length.out = n), amount = 1))
+ 
sawtooth(x, n = 1, i = 365, applications = data.frame(time = seq(0, (n -
+  1) * i, length.out = n), amount = 1))

Arguments

@@ -114,15 +114,15 @@ the corresponding amounts applied in the second column.

plot(pred_2_saw, max_twa=21, max_twa_var="m1")
max_twa(pred_2_saw)
#> $max #> parent m1 -#> 0.6627707 0.8542785 +#> 0.7834480 0.8617048 #> #> $window_start #> parent m1 -#> 0.00 32.09 +#> 0.00 26.85 #> #> $window_end #> parent m1 -#> 21.00 53.09 +#> 21.00 47.85 #>