diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2019-02-26 20:28:15 +0100 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2019-02-26 20:33:32 +0100 |
| commit | 396e40d2c45d81a8e74c41a2f632665021e980a1 (patch) | |
| tree | c7ab9b5356361b1939e9b00183a7f31071782f64 /tests | |
| parent | 64e636d11311be57978ef394c48c9b43fe219059 (diff) | |
NAFTA SOP Attachment vignette
Also:
- Change rounding in print.nafta
- Add dots argument to nafta()
- Use cores=1 in examples
- Restrict N in IORE model to values > 0
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/testthat/NAFTA_SOP_Appendix_B.txt | 16 | ||||
| -rw-r--r-- | tests/testthat/NAFTA_SOP_Appendix_D.txt | 10 | ||||
| -rw-r--r-- | tests/testthat/test_nafta.R | 2 |
3 files changed, 14 insertions, 14 deletions
diff --git a/tests/testthat/NAFTA_SOP_Appendix_B.txt b/tests/testthat/NAFTA_SOP_Appendix_B.txt index 54b70880..3842db91 100644 --- a/tests/testthat/NAFTA_SOP_Appendix_B.txt +++ b/tests/testthat/NAFTA_SOP_Appendix_B.txt @@ -12,10 +12,10 @@ parent_0 51.2430312 1.178492e-10 45.4036817 57.0823806 k_parent_sink 0.2531291 1.608492e-06 0.1935733 0.3310082 $IORE - Estimate Pr(>t) Lower Upper -parent_0 51.71052958 8.522722e-15 4.951371e+01 53.907348315 -k__iore_parent_sink 0.00134836 6.841092e-02 3.421381e-04 0.005313861 -N_parent 2.66146927 3.975823e-08 2.191012e+00 3.131926902 + Estimate Pr(>t) Lower Upper +parent_0 51.710529483 8.522723e-15 4.951371e+01 53.907348241 +k__iore_parent_sink 0.001348359 6.841094e-02 3.421379e-04 0.005313859 +N_parent 2.661469429 3.975823e-08 2.191012e+00 3.131927092 $DFOP Estimate Pr(>t) Lower Upper @@ -27,9 +27,9 @@ g 0.83380396 5.718367e-12 0.771816175 0.88153694 DTx values: DT50 DT90 DT50_rep -SFO 3 9 3 -IORE 1 28 9 -DFOP 2 40 54 +SFO 2.74 9.1 2.74 +IORE 1.37 28.5 8.57 +DFOP 2.17 39.9 54.40 Representative half-life: -[1] 8.573301 +[1] 8.573302 diff --git a/tests/testthat/NAFTA_SOP_Appendix_D.txt b/tests/testthat/NAFTA_SOP_Appendix_D.txt index d01accf2..8720a3b6 100644 --- a/tests/testthat/NAFTA_SOP_Appendix_D.txt +++ b/tests/testthat/NAFTA_SOP_Appendix_D.txt @@ -14,8 +14,8 @@ k_parent_sink 0.001703321 7.452357e-05 0.001108568 0.002617164 $IORE Estimate Pr(>t) Lower Upper parent_0 9.685291e+01 NA 8.752855e+01 1.061773e+02 -k__iore_parent_sink 8.403374e-14 NA 1.092054e-19 6.466412e-08 -N_parent 6.684458e+00 NA 3.538511e+00 9.830405e+00 +k__iore_parent_sink 8.403401e-14 NA 1.092058e-19 6.466429e-08 +N_parent 6.684457e+00 NA 3.538510e+00 9.830404e+00 $DFOP Estimate Pr(>t) Lower Upper @@ -27,9 +27,9 @@ g 2.881037e-01 1.313715e-04 1.783967e-01 4.299694e-01 DTx values: DT50 DT90 DT50_rep -SFO 407 1352 407 -IORE 541 5192066 1562968 -DFOP 429 2383 841 +SFO 407 1350 407 +IORE 541 5190000 1560000 +DFOP 429 2380 841 Representative half-life: [1] 841.4096 diff --git a/tests/testthat/test_nafta.R b/tests/testthat/test_nafta.R index a50d8f36..ad0f1d63 100644 --- a/tests/testthat/test_nafta.R +++ b/tests/testthat/test_nafta.R @@ -47,7 +47,7 @@ test_that("Test data from Appendix D are correctly evaluated", { # From Figure D.1 dtx_sop <- matrix(c(407, 541, 429, 1352, 5192066, 2383), nrow = 3, ncol = 2) - expect_equivalent(round(res$distimes[, 1:2]), dtx_sop) + expect_equivalent(round(res$distimes[, 1:2]), dtx_sop, tolerance = 0.00001) C0_sop <- c(SFO = 83.8, IORE = 96.9, DFOP = 97.6) C0_mkin <- sapply(res$parameters, function(x) x["parent_0", "Estimate"]) |