From ec9e65053b214fa30e8b947ccbc47930eeaa01a4 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Thu, 16 Apr 2015 11:00:53 +0200 Subject: Check compiled mkinmod versions in examples and tests Tests all pass (Linux) --- inst/unitTests/runit.mkinerrmin.R | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'inst') diff --git a/inst/unitTests/runit.mkinerrmin.R b/inst/unitTests/runit.mkinerrmin.R index 56a33ff9..96793a36 100644 --- a/inst/unitTests/runit.mkinerrmin.R +++ b/inst/unitTests/runit.mkinerrmin.R @@ -8,26 +8,34 @@ test.FOCUS_2006_D_SFO_SFO <- function() m1 = list(type = "SFO"), use_of_ff = "max") fit.1.e <- mkinfit(SFO_SFO.1, FOCUS_2006_D) - fit.1.d <- mkinfit(SFO_SFO.1, solution_type = "deSolve", FOCUS_2006_D) + 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.d <- mkinfit(SFO_SFO.2, solution_type = "deSolve", FOCUS_2006_D) + 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.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.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.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.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)) round(mkinerrmin(fit.2.e), 4) round(mkinerrmin(fit.2.d), 4) -- cgit v1.2.1