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/test_data_from_UBA_2014.html | 70 +++++++++++++++-------------- 1 file changed, 36 insertions(+), 34 deletions(-) (limited to 'docs/reference/test_data_from_UBA_2014.html') diff --git a/docs/reference/test_data_from_UBA_2014.html b/docs/reference/test_data_from_UBA_2014.html index 28e8b41c..dfb49619 100644 --- a/docs/reference/test_data_from_UBA_2014.html +++ b/docs/reference/test_data_from_UBA_2014.html @@ -64,7 +64,7 @@ mkin - 0.9.48.1 + 0.9.49.4 @@ -158,23 +158,24 @@ # large parameter correlations, among other reasons (e.g. the adequacy of the # model). m_ws <- mkinmod(parent_w = mkinsub("SFO", "parent_s"), - parent_s = mkinsub("SFO", "parent_w"))
#> Successfully compiled differential equation model from auto-generated C code.
f_river <- mkinfit(m_ws, test_data_from_UBA_2014[[1]]$data, quiet = TRUE) - plot_sep(f_river)
- summary(f_river)$bpar
#> Warning: Could not estimate covariance matrix; singular system.
#> Estimate se_notrans t value Pr(>t) Lower -#> parent_w_0 9.598567e+01 2.33959800 4.102657e+01 9.568967e-19 NA -#> k_parent_w_sink 3.603743e-01 0.03497750 1.030303e+01 4.989002e-09 NA -#> k_parent_w_parent_s 6.031371e-02 0.01746024 3.454346e+00 1.514723e-03 NA -#> k_parent_s_sink 5.108539e-11 0.10382001 4.920572e-10 5.000000e-01 NA -#> k_parent_s_parent_w 7.419672e-02 0.11338240 6.543936e-01 2.608069e-01 NA -#> Upper -#> parent_w_0 NA -#> k_parent_w_sink NA -#> k_parent_w_parent_s NA -#> k_parent_s_sink NA -#> k_parent_s_parent_w NA
mkinerrmin(f_river)
#> err.min n.optim df + parent_s = mkinsub("SFO", "parent_w"))
#> Successfully compiled differential equation model from auto-generated C code.
f_river <- mkinfit(m_ws, test_data_from_UBA_2014[[1]]$data, quiet = TRUE)
#> Warning: Observations with value of zero were removed from the data
plot_sep(f_river)
+ summary(f_river)$bpar
#> Estimate se_notrans t value Pr(>t) +#> parent_w_0 9.598567e+01 2.12352039 4.520120e+01 9.476357e-18 +#> k_parent_w_sink 3.603743e-01 0.03149366 1.144276e+01 4.128096e-09 +#> k_parent_w_parent_s 6.031371e-02 0.01603582 3.761185e+00 9.436293e-04 +#> k_parent_s_sink 7.560341e-11 0.09483761 7.971881e-10 5.000000e-01 +#> k_parent_s_parent_w 7.419672e-02 0.10738374 6.909493e-01 2.500756e-01 +#> sigma 2.982879e+00 0.50546582 5.901247e+00 1.454824e-05 +#> Lower Upper +#> parent_w_0 91.48420501 100.4871438 +#> k_parent_w_sink 0.30668904 0.4234571 +#> k_parent_w_parent_s 0.03423904 0.1062455 +#> k_parent_s_sink 0.00000000 Inf +#> k_parent_s_parent_w 0.02289956 0.2404043 +#> sigma 2.00184022 3.9639169
mkinerrmin(f_river)
#> err.min n.optim df #> All data 0.09246946 5 6 #> parent_w 0.06377096 3 3 -#> parent_s 0.20882324 2 3
+#> parent_s 0.20882325 2 3
# This is the evaluation used for the validation of software packages # in the expertise from 2014 m_soil <- mkinmod(parent = mkinsub("SFO", c("M1", "M2")), @@ -182,27 +183,28 @@ M2 = mkinsub("SFO", "M3"), M3 = mkinsub("SFO"), use_of_ff = "max")
#> Successfully compiled differential equation model from auto-generated C code.
- f_soil <- mkinfit(m_soil, test_data_from_UBA_2014[[3]]$data, quiet = TRUE) - plot_sep(f_soil, lpos = c("topright", "topright", "topright", "bottomright"))
summary(f_soil)$bpar
#> Estimate se_notrans t value Pr(>t) Lower -#> parent_0 76.55425584 0.943443794 81.1434198 4.422336e-30 74.602593773 -#> k_parent 0.12081956 0.004815515 25.0896457 1.639665e-18 0.111257517 -#> k_M1 0.84258651 0.930121548 0.9058886 1.871938e-01 0.085876516 -#> k_M2 0.04210878 0.013729902 3.0669396 2.729137e-03 0.021450630 -#> k_M3 0.01122919 0.008044865 1.3958206 8.804912e-02 0.002550984 -#> f_parent_to_M1 0.32240199 0.278620579 1.1571363 1.295467e-01 NA -#> f_parent_to_M2 0.16099854 0.030548888 5.2701931 1.196190e-05 NA -#> f_M1_to_M3 0.27921500 0.314732842 0.8871492 1.920908e-01 0.015016983 -#> f_M2_to_M3 0.55641333 0.650246995 0.8556954 2.004966e-01 0.005360555 + f_soil <- mkinfit(m_soil, test_data_from_UBA_2014[[3]]$data, quiet = TRUE)
#> Warning: Observations with value of zero were removed from the data
plot_sep(f_soil, lpos = c("topright", "topright", "topright", "bottomright"))
summary(f_soil)$bpar
#> Estimate se_notrans t value Pr(>t) Lower +#> parent_0 76.55425584 0.859186614 89.1008479 1.113866e-26 74.755959751 +#> k_parent 0.12081956 0.004601922 26.2541548 1.077373e-16 0.111561582 +#> k_M1 0.84258651 0.806231481 1.0450925 1.545475e-01 0.113839756 +#> k_M2 0.04210878 0.017083049 2.4649452 1.170195e-02 0.018013807 +#> k_M3 0.01122919 0.007245890 1.5497322 6.885127e-02 0.002909463 +#> f_parent_to_M1 0.32240199 0.240803570 1.3388589 9.820821e-02 NA +#> f_parent_to_M2 0.16099854 0.033691991 4.7785403 6.531225e-05 NA +#> f_M1_to_M3 0.27921500 0.269443517 1.0362654 1.565440e-01 0.022992921 +#> f_M2_to_M3 0.55641333 0.595125456 0.9349513 1.807725e-01 0.008003316 +#> sigma 1.14005399 0.149696423 7.6157731 1.727024e-07 0.826735778 #> Upper -#> parent_0 78.50591790 -#> k_parent 0.13120341 -#> k_M1 8.26712661 -#> k_M2 0.08266188 -#> k_M3 0.04942981 +#> parent_0 78.35255192 +#> k_parent 0.13084582 +#> k_M1 6.23641562 +#> k_M2 0.09843279 +#> k_M3 0.04333950 #> f_parent_to_M1 NA #> f_parent_to_M2 NA -#> f_M1_to_M3 0.90777163 -#> f_M2_to_M3 0.99658633
mkinerrmin(f_soil)
#> err.min n.optim df +#> f_M1_to_M3 0.86443090 +#> f_M2_to_M3 0.99489847 +#> sigma 1.45337221
mkinerrmin(f_soil)
#> err.min n.optim df #> All data 0.09649963 9 20 #> parent 0.04721283 2 6 #> M1 0.26551209 2 5 -- cgit v1.2.1