diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2015-04-16 13:22:57 +0200 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2015-04-16 13:22:57 +0200 |
| commit | f9198dc35109df526607df213ebefee182b5b24f (patch) | |
| tree | a741a054aa33d3e2665be2a2a16f59d5020bae9a | |
| parent | e610eb47f460bdb16a1160c9e4cc6fd7051d2546 (diff) | |
Add tests for default solution method, fix one test
| -rw-r--r-- | inst/unitTests/runit.mkinerrmin.R | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/inst/unitTests/runit.mkinerrmin.R b/inst/unitTests/runit.mkinerrmin.R index 96793a36..f4cceda6 100644 --- a/inst/unitTests/runit.mkinerrmin.R +++ b/inst/unitTests/runit.mkinerrmin.R @@ -7,35 +7,44 @@ test.FOCUS_2006_D_SFO_SFO <- function() SFO_SFO.2 <- mkinmod(parent = list(type = "SFO", to = "m1"), m1 = list(type = "SFO"), use_of_ff = "max") - fit.1.e <- mkinfit(SFO_SFO.1, FOCUS_2006_D) + # Check fitting with default solution method, and the different possibilities + fit.1 <- mkinfit(SFO_SFO.1, FOCUS_2006_D) + fit.1.e <- mkinfit(SFO_SFO.1, FOCUS_2006_D, solution_type = "eigen") fit.1.d <- mkinfit(SFO_SFO.1, solution_type = "deSolve", use_compiled = FALSE, FOCUS_2006_D) fit.1.dc <- mkinfit(SFO_SFO.1, solution_type = "deSolve", use_compiled = TRUE, FOCUS_2006_D) - fit.2.e <- mkinfit(SFO_SFO.2, FOCUS_2006_D) + fit.2 <- mkinfit(SFO_SFO.2, FOCUS_2006_D) + fit.2.e <- mkinfit(SFO_SFO.2, FOCUS_2006_D, solution_type = "eigen") fit.2.d <- mkinfit(SFO_SFO.2, solution_type = "deSolve", use_compiled = FALSE, FOCUS_2006_D) fit.2.dc <- mkinfit(SFO_SFO.2, solution_type = "deSolve", use_compiled = TRUE, FOCUS_2006_D) FOCUS_2006_D_results_schaefer07_means <- c( parent_0 = 99.65, DT50_parent = 7.04, DT50_m1 = 131.34) + r.1 <- c(fit.1$bparms.optim[[1]], endpoints(fit.1)$distimes[[1]]) r.1.e <- c(fit.1.e$bparms.optim[[1]], endpoints(fit.1.e)$distimes[[1]]) r.1.d <- c(fit.1.d$bparms.optim[[1]], endpoints(fit.1.d)$distimes[[1]]) r.1.dc <- c(fit.1.dc$bparms.optim[[1]], endpoints(fit.1.dc)$distimes[[1]]) + r.2 <- c(fit.2$bparms.optim[[1]], endpoints(fit.2)$distimes[[1]]) r.2.e <- c(fit.2.e$bparms.optim[[1]], endpoints(fit.2.e)$distimes[[1]]) r.2.d <- c(fit.2.d$bparms.optim[[1]], endpoints(fit.2.d)$distimes[[1]]) r.2.dc <- c(fit.2.dc$bparms.optim[[1]], endpoints(fit.2.dc)$distimes[[1]]) + dev.1 <- 100 * (r.1 - FOCUS_2006_D_results_schaefer07_means)/r.1 + checkIdentical(as.numeric(abs(dev.1)) < 1, rep(TRUE, 3)) dev.1.e <- 100 * (r.1.e - FOCUS_2006_D_results_schaefer07_means)/r.1.e checkIdentical(as.numeric(abs(dev.1.e)) < 1, rep(TRUE, 3)) dev.1.d <- 100 * (r.1.d - FOCUS_2006_D_results_schaefer07_means)/r.1.d checkIdentical(as.numeric(abs(dev.1.d)) < 1, rep(TRUE, 3)) dev.1.dc <- 100 * (r.1.dc - FOCUS_2006_D_results_schaefer07_means)/r.1.dc checkIdentical(as.numeric(abs(dev.1.dc)) < 1, rep(TRUE, 3)) + dev.2 <- 100 * (r.2 - FOCUS_2006_D_results_schaefer07_means)/r.2 + checkIdentical(as.numeric(abs(dev.2)) < 1, rep(TRUE, 3)) dev.2.e <- 100 * (r.2.e - FOCUS_2006_D_results_schaefer07_means)/r.2.e checkIdentical(as.numeric(abs(dev.2.e)) < 1, rep(TRUE, 3)) dev.2.d <- 100 * (r.2.d - FOCUS_2006_D_results_schaefer07_means)/r.2.d checkIdentical(as.numeric(abs(dev.2.d)) < 1, rep(TRUE, 3)) dev.2.dc <- 100 * (r.2.dc - FOCUS_2006_D_results_schaefer07_means)/r.2.dc - checkIdentical(as.numeric(abs(dev.2.d)) < 1, rep(TRUE, 3)) + checkIdentical(as.numeric(abs(dev.2.dc)) < 1, rep(TRUE, 3)) round(mkinerrmin(fit.2.e), 4) round(mkinerrmin(fit.2.d), 4) |