From 45d5b74fa1263f8ac862c43efe4f5900323d2382 Mon Sep 17 00:00:00 2001 From: jranke Date: Thu, 3 Jun 2010 20:36:05 +0000 Subject: - Add the documentation of the KinGUI test data results - Fix the corresponding test based on these results git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@12 edb9625f-4e0d-4859-8d74-9fd3b1da38cb --- inst/unitTests/runit.mkinfit.R | 2 +- man/schaefer07_complex_case.Rd | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/inst/unitTests/runit.mkinfit.R b/inst/unitTests/runit.mkinfit.R index 6dbd11f2..df09cc64 100644 --- a/inst/unitTests/runit.mkinfit.R +++ b/inst/unitTests/runit.mkinfit.R @@ -31,5 +31,5 @@ test.mkinmod.schaefer07_complex_example <- function() s$distimes["A2", "DT50"]) r$means <- (r$KinGUI + r$ModelMaker)/2 r$mkin.deviation <- abs(round(100 * ((r$mkin - r$means)/r$means), digits=1)) - checkTrue(r$mkin.deviation < 10) + checkIdentical(r$mkin.deviation < 10, rep(TRUE, length(r$mkin.deviation))) } diff --git a/man/schaefer07_complex_case.Rd b/man/schaefer07_complex_case.Rd index 2978e25d..f2f024a2 100644 --- a/man/schaefer07_complex_case.Rd +++ b/man/schaefer07_complex_case.Rd @@ -1,5 +1,6 @@ \name{schaefer07_complex_case} \alias{schaefer07_complex_case} +\alias{schaefer07_complex_results} \encoding{latin1} \docType{data} \title{ @@ -8,10 +9,11 @@ \description{ This dataset was used for a comparison of KinGUI and ModelMaker to check the software quality of KinGUI in the original publication (Schäfer et al., 2007). + The results from the fitting are also included. } \usage{data(schaefer07_complex_case)} \format{ - A data frame with 8 observations on the following 6 variables. + The data set is a data frame with 8 observations on the following 6 variables. \describe{ \item{\code{time}}{a numeric vector} \item{\code{parent}}{a numeric vector} @@ -20,6 +22,7 @@ \item{\code{C1}}{a numeric vector} \item{\code{A2}}{a numeric vector} } + The results are a data frame with 14 results for different parameter values } \source{ Schäfer D, Mikolasch M, Rainbird P and Harvey B (2007). KinGUI: a new kinetic -- cgit v1.2.1