From 194659fcaccdd1ee37851725b8c72e99daa3a8cf Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Wed, 10 Apr 2019 10:17:35 +0200 Subject: Adapt tests, vignettes and examples - Write the NEWS - Static documentation rebuilt by pkgdown - Adapt mkinerrmin - Fix (hopefully all) remaining problems in mkinfit --- docs/reference/mkinpredict.html | 76 ++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 39 deletions(-) (limited to 'docs/reference/mkinpredict.html') diff --git a/docs/reference/mkinpredict.html b/docs/reference/mkinpredict.html index fb4afa9a..56c1ed27 100644 --- a/docs/reference/mkinpredict.html +++ b/docs/reference/mkinpredict.html @@ -65,7 +65,7 @@ mkin - 0.9.48.1 + 0.9.49.4 @@ -333,50 +333,48 @@ c(parent = 100, m1 = 0), seq(0, 20, by = 0.1), solution_type = "deSolve")[201,]))
#> time parent m1 #> 201 20 4.978707 27.46227
#> User System verstrichen -#> 0.002 0.000 0.002
system.time( +#> 0.002 0.000 0.001
system.time( print(mkinpredict(SFO_SFO, c(k_parent_m1 = 0.05, k_parent_sink = 0.1, k_m1_sink = 0.01), c(parent = 100, m1 = 0), seq(0, 20, by = 0.1), solution_type = "deSolve", use_compiled = FALSE)[201,]))
#> time parent m1 #> 201 20 4.978707 27.46227
#> User System verstrichen -#> 0.039 0.000 0.039
+#> 0.04 0.00 0.04
# Predict from a fitted model - f <- mkinfit(SFO_SFO, FOCUS_2006_C)
#> Model cost at call 1 : 552.5739 -#> Model cost at call 3 : 552.5739 -#> Model cost at call 4 : 552.5739 -#> Model cost at call 6 : 279.9345 -#> Model cost at call 7 : 279.9344 -#> Model cost at call 8 : 279.9294 -#> Model cost at call 9 : 279.9294 -#> Model cost at call 12 : 200.3629 -#> Model cost at call 13 : 200.3629 -#> Model cost at call 18 : 197.9039 -#> Model cost at call 23 : 197.9039 -#> Model cost at call 25 : 196.6754 -#> Model cost at call 27 : 196.6754 -#> Model cost at call 32 : 196.5742 -#> Model cost at call 33 : 196.5742 -#> Model cost at call 34 : 196.5742 -#> Model cost at call 38 : 196.5361 -#> Model cost at call 40 : 196.5361 -#> Model cost at call 44 : 196.5336 -#> Model cost at call 45 : 196.5336 -#> Model cost at call 50 : 196.5334 -#> Model cost at call 51 : 196.5334 -#> Model cost at call 52 : 196.5334 -#> Model cost at call 56 : 196.5334 -#> Model cost at call 58 : 196.5334 -#> Model cost at call 59 : 196.5334 -#> Model cost at call 65 : 196.5334 -#> Model cost at call 73 : 196.5334 -#> Model cost at call 78 : 196.5334 -#> Model cost at call 80 : 196.5334 -#> Optimisation by method Port successfully terminated.
head(mkinpredict(f))
#> time parent m1 + f <- mkinfit(SFO_SFO, FOCUS_2006_C)
#> Negative log-likelihood at call 1: 552.5739 +#> Negative log-likelihood at call 3: 552.5739 +#> Negative log-likelihood at call 4: 552.5739 +#> Negative log-likelihood at call 6: 279.9345 +#> Negative log-likelihood at call 7: 279.9344 +#> Negative log-likelihood at call 8: 279.9294 +#> Negative log-likelihood at call 9: 279.9294 +#> Negative log-likelihood at call 12: 200.3629 +#> Negative log-likelihood at call 13: 200.3629 +#> Negative log-likelihood at call 18: 197.9039 +#> Negative log-likelihood at call 25: 196.6754 +#> Negative log-likelihood at call 27: 196.6754 +#> Negative log-likelihood at call 32: 196.5742 +#> Negative log-likelihood at call 33: 196.5742 +#> Negative log-likelihood at call 34: 196.5742 +#> Negative log-likelihood at call 38: 196.5361 +#> Negative log-likelihood at call 40: 196.5361 +#> Negative log-likelihood at call 44: 196.5336 +#> Negative log-likelihood at call 45: 196.5336 +#> Negative log-likelihood at call 50: 196.5334 +#> Negative log-likelihood at call 51: 196.5334 +#> Negative log-likelihood at call 52: 196.5334 +#> Negative log-likelihood at call 56: 196.5334 +#> Negative log-likelihood at call 58: 196.5334 +#> Negative log-likelihood at call 59: 196.5334 +#> Negative log-likelihood at call 65: 196.5334 +#> Negative log-likelihood at call 75: 26.64668 +#> Negative log-likelihood at call 103: 26.64668 +#> Optimisation successfully terminated.
head(mkinpredict(f))
#> time parent m1 #> 1 0.0 82.49216 0.000000 -#> 2 0.1 80.00563 1.179955 -#> 3 0.2 77.59404 2.312580 -#> 4 0.3 75.25515 3.399419 -#> 5 0.4 72.98675 4.441969 -#> 6 0.5 70.78673 5.441679
+#> 2 0.1 80.00563 1.179956 +#> 3 0.2 77.59404 2.312583 +#> 4 0.3 75.25515 3.399424 +#> 5 0.4 72.98675 4.441974 +#> 6 0.5 70.78673 5.441685