From 3947731a5a8c3598271b26f5201dea4bcb13ef6d Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Thu, 19 Jan 2017 10:47:09 +0100 Subject: Fix one_box for ini = 1, use in sawtooth examples --- docs/reference/one_box.html | 2 +- docs/reference/plot.one_box-8.png | Bin 13490 -> 13603 bytes docs/reference/plot.one_box.html | 2 +- docs/reference/sawtooth-6.png | Bin 13490 -> 13603 bytes docs/reference/sawtooth.html | 6 +++--- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'docs/reference') diff --git a/docs/reference/one_box.html b/docs/reference/one_box.html index cb49c02..853f892 100644 --- a/docs/reference/one_box.html +++ b/docs/reference/one_box.html @@ -116,7 +116,7 @@ decline. If x is an mkinfit object, the decline is calculated from this objectplot(pred_1)
# Use a model with more than one observed variable m_2 <- mkinmod(parent = mkinsub("SFO", "m1"), m1 = mkinsub("SFO"))
#> Successfully compiled differential equation model from auto-generated C code.
fit_2 <- mkinfit(m_2, FOCUS_2006_D, quiet = TRUE) -pred_2 <- one_box(fit_2) +pred_2 <- one_box(fit_2, ini = "model") plot(pred_2)
plot(sawtooth(dfop_pred, 3, 7), max_twa = 21)
# Use a fitted mkinfit model m_2 <- mkinmod(parent = mkinsub("SFO", "m1"), m1 = mkinsub("SFO"))
#> Successfully compiled differential equation model from auto-generated C code.
fit_2 <- mkinfit(m_2, FOCUS_2006_D, quiet = TRUE) -pred_2 <- one_box(fit_2) +pred_2 <- one_box(fit_2, ini = 1) pred_2_saw <- sawtooth(pred_2, 2, 7) plot(pred_2_saw, max_twa = 21, max_twa_var = "m1")
diff --git a/docs/reference/sawtooth-6.png b/docs/reference/sawtooth-6.png index f534444..161ecb4 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 216f64a..be43745 100644 --- a/docs/reference/sawtooth.html +++ b/docs/reference/sawtooth.html @@ -98,12 +98,12 @@ the corresponding amounts applied in the second column. pred <- one_box(10) plot(sawtooth(pred, applications = applications))
m_2 <- mkinmod(parent = mkinsub("SFO", "m1"), m1 = mkinsub("SFO"))
#> Successfully compiled differential equation model from auto-generated C code.
fit_2 <- mkinfit(m_2, FOCUS_2006_D, quiet = TRUE) -pred_2 <- one_box(fit_2) +pred_2 <- one_box(fit_2, ini = 1) pred_2_saw <- sawtooth(pred_2, 2, 7) plot(pred_2_saw, max_twa = 21, max_twa_var = "m1")
max_twa(pred_2_saw)
#> $max -#> parent m1 -#> 66.01096 85.08484 +#> parent m1 +#> 0.6627707 0.8542785 #> #> $window_start #> parent m1 -- cgit v1.2.1