aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--DESCRIPTION2
-rw-r--r--NAMESPACE1
-rw-r--r--R/mkinfit.R69
-rw-r--r--R/mkinpredict.R (renamed from R/predict.mkinmod.R)7
-rw-r--r--R/transform_odeparms.R70
-rw-r--r--TODO9
-rw-r--r--inst/unitTests/runit.mkinfit.R56
-rw-r--r--inst/unitTests/runit.mkinmod.R74
-rw-r--r--man/ilr.Rd8
-rw-r--r--man/mkinpredict.Rd63
-rw-r--r--man/summary.mkinfit.Rd11
-rw-r--r--man/transform_odeparms.Rd51
-rw-r--r--vignettes/Rplots.pdf (renamed from inst/doc/Rplots.pdf)0
-rw-r--r--vignettes/header.tex (renamed from inst/doc/header.tex)2
-rw-r--r--vignettes/mkin.Rnw (renamed from inst/doc/mkin.Rnw)16
-rw-r--r--vignettes/mkin.pdf (renamed from inst/doc/mkin.pdf)bin178902 -> 178902 bytes
-rw-r--r--vignettes/references.bib (renamed from inst/doc/references.bib)0
-rw-r--r--vignettes/run.bat (renamed from inst/doc/run.bat)0
18 files changed, 267 insertions, 172 deletions
diff --git a/DESCRIPTION b/DESCRIPTION
index 6951ede..a7f33e2 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -3,7 +3,7 @@ Type: Package
Title: Routines for fitting kinetic models with one or more state
variables to chemical degradation data
Version: 0.9-01
-Date: 2012-03-26
+Date: 2012-04-10
Author: Johannes Ranke, Katrin Lindenberger, René Lehmann
Maintainer: Johannes Ranke <jranke@uni-bremen.de>
Description: Calculation routines based on the FOCUS Kinetics Report (2006).
diff --git a/NAMESPACE b/NAMESPACE
new file mode 100644
index 0000000..06c6464
--- /dev/null
+++ b/NAMESPACE
@@ -0,0 +1 @@
+export(mkinmod, mkinpredict, mkinfit, mkinplot, mkin_long_to_wide, mkin_wide_to_long, ilr, invilr, transform_odeparms, backtransform_odeparms)
diff --git a/R/mkinfit.R b/R/mkinfit.R
index 47c39cf..44eb5b2 100644
--- a/R/mkinfit.R
+++ b/R/mkinfit.R
@@ -57,15 +57,17 @@ mkinfit <- function(mkinmod, observed,
if (parmname == "tb") parms.ini[parmname] = 5
if (parmname == "g") parms.ini[parmname] = 0.5
}
- parms.ini <- transform_odeparms(parms.ini, mod_vars)
-
+
# Name the inital state variable values if they are not named yet
if(is.null(names(state.ini))) names(state.ini) <- mod_vars
+ # Transform initial parameter values for fitting
+ transparms.ini <- transform_odeparms(parms.ini, mod_vars)
+
# Parameters to be optimised:
# Kinetic parameters in parms.ini whose names are not in fixed_parms
- parms.fixed <- parms.ini[fixed_parms]
- parms.optim <- parms.ini[setdiff(names(parms.ini), fixed_parms)]
+ parms.fixed <- transparms.ini[fixed_parms]
+ parms.optim <- transparms.ini[setdiff(names(transparms.ini), fixed_parms)]
# Inital state variables in state.ini whose names are not in fixed_initials
state.ini.fixed <- state.ini[fixed_initials]
@@ -83,8 +85,11 @@ mkinfit <- function(mkinmod, observed,
if (length(mkinmod$map) == 1) {
solution = "analytical"
} else {
- if (is.matrix(mkinmod$coefmat) & eigen) solution = "eigen"
- else solution = "deSolve"
+ if (is.matrix(mkinmod$coefmat) && eigen) {
+ solution = "eigen"
+ } else {
+ solution = "deSolve"
+ }
}
cost.old <- 1e100 # The first model cost should be smaller than this value
@@ -105,10 +110,10 @@ mkinfit <- function(mkinmod, observed,
odeparms <- c(P[(length(state.ini.optim) + 1):length(P)], parms.fixed)
- transparms <- transform_odeparms(odeparms, mod_vars)
+ parms <- backtransform_odeparms(odeparms, mod_vars)
# Solve the system with current transformed parameter values
- out <- predict(mkinmod, transparms, odeini, outtimes, solution_type = solution)
+ out <- mkinpredict(mkinmod, parms, odeini, outtimes, solution_type = solution, ...)
assign("out_predicted", out, inherits=TRUE)
@@ -123,8 +128,8 @@ mkinfit <- function(mkinmod, observed,
if(plot) {
outtimes_plot = seq(min(observed$time), max(observed$time), length.out=100)
- out_plot <- predict(mkinmod, transparms, odeini, outtimes_plot,
- solution_type = solution)
+ out_plot <- mkinpredict(mkinmod, parms, odeini, outtimes_plot,
+ solution_type = solution, ...)
plot(0, type="n",
xlim = range(observed$time), ylim = range(observed$value, na.rm=TRUE),
@@ -160,8 +165,10 @@ mkinfit <- function(mkinmod, observed,
fit$predicted <- out_predicted
# Collect initial parameter values in two dataframes
- fit$start <- data.frame(initial = c(state.ini.optim, parms.optim))
+ fit$start <- data.frame(initial = c(state.ini.optim,
+ backtransform_odeparms(parms.optim, mod_vars)))
fit$start$type = c(rep("state", length(state.ini.optim)), rep("deparm", length(parms.optim)))
+ fit$start$transformed = c(state.ini.optim, parms.optim)
fit$fixed <- data.frame(
value = c(state.ini.fixed, parms.fixed))
@@ -194,7 +201,7 @@ mkinfit <- function(mkinmod, observed,
fit$errmin <- errmin
# Calculate dissipation times DT50 and DT90 from parameters
- parms.all = transform_odeparms(c(fit$par, parms.fixed), mod_vars)
+ parms.all = backtransform_odeparms(c(fit$par, parms.fixed), mod_vars)
fit$distimes <- data.frame(DT50 = rep(NA, length(obs_vars)), DT90 = rep(NA, length(obs_vars)),
row.names = obs_vars)
fit$SFORB <- vector()
@@ -285,16 +292,14 @@ mkinfit <- function(mkinmod, observed,
data$variable <- ordered(data$variable, levels = obs_vars)
fit$data <- data[order(data$variable, data$time), ]
fit$atol <- atol
+ fit$parms.all <- parms.all
class(fit) <- c("mkinfit", "modFit")
return(fit)
}
-summary.mkinfit <- function(object, data = TRUE, distimes = TRUE, ff = TRUE, ...) {
+summary.mkinfit <- function(object, data = TRUE, distimes = TRUE, ...) {
param <- object$par
- if (object$logk) {
- names(param) <- sub("^k_", "log k_", names(param))
- }
pnames <- names(param)
p <- length(param)
covar <- try(solve(0.5*object$hessian), silent = TRUE) # unscaled covariance
@@ -304,7 +309,7 @@ summary.mkinfit <- function(object, data = TRUE, distimes = TRUE, ff = TRUE, ...
covar <- matrix(data = NA, nrow = p, ncol = p)
} else message <- "ok"
- rownames(covar) <- colnames(covar) <-pnames
+ rownames(covar) <- colnames(covar) <- pnames
rdf <- object$df.residual
resvar <- object$ssr / rdf
se <- sqrt(diag(covar) * resvar)
@@ -312,12 +317,6 @@ summary.mkinfit <- function(object, data = TRUE, distimes = TRUE, ff = TRUE, ...
tval <- param / se
modVariance <- object$ssr / length(object$residuals)
- if (!all(object$start$lower >=0)) {
- message <- "Note that the one-sided t-test may not be appropriate if
- parameter values below zero are possible."
- warning(message)
- } else message <- "ok"
-
param <- cbind(param, se)
dimnames(param) <- list(pnames, c("Estimate", "Std. Error"))
@@ -335,20 +334,17 @@ summary.mkinfit <- function(object, data = TRUE, distimes = TRUE, ff = TRUE, ...
if(data) ans$data <- object$data
ans$start <- object$start
- # Fix names of parameters to show that they were transformed
- names(ans$start) <- sub("^k_", "log k_", names(ans$start))
-
ans$fixed <- object$fixed
ans$errmin <- object$errmin
+ ans$parms.all <- object$parms.all
if(distimes) ans$distimes <- object$distimes
- if(ff) ans$ff <- object$ff
if(length(object$SFORB) != 0) ans$SFORB <- object$SFORB
class(ans) <- c("summary.mkinfit", "summary.modFit")
return(ans)
}
# Expanded from print.summary.modFit
-print.summary.mkinfit <- function(x, digits = max(3, getOption("digits") - 3), tval = TRUE, ...) {
+print.summary.mkinfit <- function(x, digits = max(3, getOption("digits") - 3), ...) {
cat("\nEquations:\n")
print(noquote(as.character(x[["diffs"]])))
df <- x$df
@@ -361,12 +357,11 @@ print.summary.mkinfit <- function(x, digits = max(3, getOption("digits") - 3), t
if(length(x$fixed$value) == 0) cat("None\n")
else print(x$fixed)
- cat("\nOptimised parameters:\n")
- if (tval) printCoefmat(x$par, digits = digits, ...)
- else {
- printCoefmat(x$par[,c(1,2,4)], cs.in = c(1,2), tst.ind = integer(0),
- P.values = TRUE, has.Pvalue = TRUE, digits = digits, ...)
- }
+ cat("\nOptimised, transformed parameters:\n")
+ printCoefmat(x$par, digits = digits, ...)
+
+ cat("\nBacktransformed parameters:\n")
+ print(as.data.frame(list(Estimate = x$parms.all)))
cat("\nResidual standard error:",
format(signif(x$sigma, digits)), "on", rdf, "degrees of freedom\n")
@@ -381,12 +376,6 @@ print.summary.mkinfit <- function(x, digits = max(3, getOption("digits") - 3), t
print(x$distimes, digits=digits,...)
}
- printff <- !is.null(x$ff)
- if(printff){
- cat("\nEstimated formation fractions:\n")
- print(data.frame(ff = x$ff), digits=digits,...)
- }
-
printSFORB <- !is.null(x$SFORB)
if(printSFORB){
cat("\nEstimated Eigenvalues of SFORB model(s):\n")
diff --git a/R/predict.mkinmod.R b/R/mkinpredict.R
index 279fa52..49166f3 100644
--- a/R/predict.mkinmod.R
+++ b/R/mkinpredict.R
@@ -1,4 +1,4 @@
-predict.mkinmod <- function(mkinmod, odeparms, odeini, outtimes, solution_type = "deSolve", map_output = TRUE, atol = 1e-6) {
+mkinpredict <- function(mkinmod, odeparms, odeini, outtimes, solution_type = "deSolve", map_output = TRUE, atol = 1e-6, ...) {
# Get the names of the state variables in the model
mod_vars <- names(mkinmod$diffs)
@@ -69,14 +69,15 @@ predict.mkinmod <- function(mkinmod, odeparms, odeini, outtimes, solution_type =
times = outtimes,
func = mkindiff,
parms = odeparms,
- atol = atol
+ atol = atol,
+ ...
)
}
if (map_output) {
# Output transformation for models with unobserved compartments like SFORB
out_mapped <- data.frame(time = out[,"time"])
for (var in names(mkinmod$map)) {
- if((length(mkinmod$map[[var]]) == 1) || solution == "analytical") {
+ if((length(mkinmod$map[[var]]) == 1) || solution_type == "analytical") {
out_mapped[var] <- out[, var]
} else {
out_mapped[var] <- rowSums(out[, mkinmod$map[[var]]])
diff --git a/R/transform_odeparms.R b/R/transform_odeparms.R
index 4b8bfd1..8b39874 100644
--- a/R/transform_odeparms.R
+++ b/R/transform_odeparms.R
@@ -1,46 +1,72 @@
-transform_odeparms <- function(odeparms, mod_vars) {
- # Transform rate constants and formation fractions
- transparms <- odeparms
- # Exponential transformation for rate constants
- index_k <- grep("^k_", names(odeparms))
+transform_odeparms <- function(parms, mod_vars) {
+ # Set up container for transformed parameters
+ transparms <- parms
+
+ # Log transformation for rate constants
+ index_k <- grep("^k_", names(transparms))
if (length(index_k) > 0) {
- transparms[index_k] <- exp(odeparms[index_k])
+ transparms[index_k] <- log(parms[index_k])
}
- # Go through state variables and apply inverse isotropic logratio transformation
+ # Go through state variables and apply isotropic logratio transformation
for (box in mod_vars) {
- indices_f <- grep(paste("^f", box, sep = "_"), names(odeparms))
- f_names <- grep(paste("^f", box, sep = "_"), names(odeparms), value = TRUE)
+ indices_f <- grep(paste("^f", box, sep = "_"), names(parms))
+ f_names <- grep(paste("^f", box, sep = "_"), names(parms), value = TRUE)
n_paths <- length(indices_f)
if (n_paths > 0) {
- f <- invilr(odeparms[indices_f])[1:n_paths] # We do not need the last component
- names(f) <- f_names
- transparms[indices_f] <- f
+ f <- parms[indices_f]
+ trans_f <- ilr(c(f, 1 - sum(f)))
+ names(trans_f) <- f_names
+ transparms[indices_f] <- trans_f
}
}
+
+ # Transform parameters also for FOMC, DFOP and HS models
+ for (pname in c("alpha", "beta", "k1", "k2", "tb")) {
+ if (!is.na(parms[pname])) {
+ transparms[pname] <- log(parms[pname])
+ }
+ }
+ if (!is.na(parms["g"])) {
+ g <- parms["g"]
+ transparms["g"] <- ilr(c(g, 1- g))
+ }
+
return(transparms)
}
backtransform_odeparms <- function(transparms, mod_vars) {
- # Transform rate constants and formation fractions
- odeparms <- transparms
- # Log transformation for rate constants
- index_k <- grep("^k_", names(transparms))
+ # Set up container for backtransformed parameters
+ parms <- transparms
+
+ # Exponential transformation for rate constants
+ index_k <- grep("^k_", names(parms))
if (length(index_k) > 0) {
- odeparms[index_k] <- log(transparms[index_k])
+ parms[index_k] <- exp(transparms[index_k])
}
- # Go through state variables and apply isotropic logratio transformation
+ # Go through state variables and apply inverse isotropic logratio transformation
for (box in mod_vars) {
indices_f <- grep(paste("^f", box, sep = "_"), names(transparms))
f_names <- grep(paste("^f", box, sep = "_"), names(transparms), value = TRUE)
n_paths <- length(indices_f)
if (n_paths > 0) {
- trans_f <- transparms[indices_f]
- f <- ilr(c(trans_f, 1 - sum(trans_f)))
+ f <- invilr(transparms[indices_f])[1:n_paths] # We do not need the last component
names(f) <- f_names
- odeparms[indices_f] <- f
+ parms[indices_f] <- f
}
}
- return(odeparms)
+
+ # Transform parameters also for DFOP and HS models
+ for (pname in c("alpha", "beta", "k1", "k2", "tb")) {
+ if (!is.na(transparms[pname])) {
+ parms[pname] <- exp(transparms[pname])
+ }
+ }
+ if (!is.na(transparms["g"])) {
+ g <- transparms["g"]
+ parms["g"] <- invilr(g)[1]
+ }
+
+ return(parms)
}
diff --git a/TODO b/TODO
index 8f89002..fb653cc 100644
--- a/TODO
+++ b/TODO
@@ -1,15 +1,8 @@
-- Fix analytical and Eivenvalue based solutions after transition to fitting
- transformed k and f values
-- Fix FOMC model with FOCUS_2006_C
-- Transfer calculation of DT50 and DT90 calculations from mkinfit to summary.mkinfit
-- Calculate back-transformed parameters in summary.mkinfit
-- Report back-transformed parameters in print.summary.mkinfit
-- Use back-transformed parameters for DT50 and DT90 calculations
+- Fix SFORB coefficient matrix by treating SFORB models with metabolites with ilr as well
- Calculate confidence intervals for parameters assuming normal distribution
- Calculate confidence intervals for DT50 and DT90 values when only one parameter is involved
- Fix DT50 and DT90 calculation for SFORB_SFO
- Add unit tests for mkinfit
-- Remove dependency to kinfit
- Document validation against fits documented in chapter 13 of FOCUS (2006)
- Reproduce example anaylses (L1, L2, ...) in FOCUS (2006)
- Generate confidence intervals for DT50 and DT90 values for other cases
diff --git a/inst/unitTests/runit.mkinfit.R b/inst/unitTests/runit.mkinfit.R
index 831c069..2a026ce 100644
--- a/inst/unitTests/runit.mkinfit.R
+++ b/inst/unitTests/runit.mkinfit.R
@@ -1,7 +1,7 @@
# $Id: runit.mkinfit.R 68 2010-09-09 22:40:04Z jranke $
-# Copyright (C) 2010 Johannes Ranke
-# Contact: mkin-devel@lists.berlios.de
+# Copyright (C) 2010-2012 Johannes Ranke
+# Contact: jranke@uni-bremen.de
# This file is part of the R package mkin
@@ -18,38 +18,36 @@
# You should have received a copy of the GNU General Public License along with
# this program. If not, see <http://www.gnu.org/licenses/>
-test.mkinmod.schaefer07_complex_example <- function()
+test.mkinfit.schaefer07_complex_example <- function()
{
schaefer07_complex_model <- mkinmod(
- parent = list(type = "SFO", to = c("A1", "B1", "C1"), sink = FALSE),
+ parent = list(type = "SFO", to = c("A1", "B1", "C1")),
A1 = list(type = "SFO", to = "A2"),
B1 = list(type = "SFO"),
C1 = list(type = "SFO"),
A2 = list(type = "SFO"))
- fit <- mkinfit(schaefer07_complex_model,
- mkin_wide_to_long(schaefer07_complex_case, time = "time"),
- parms.ini = c(0.1, 0.1, 0.1, 0.01, 0.1, 0.1, 0.1, 0.1))
- s <- summary(fit)
- attach(as.list(fit$par))
- k_parent <- sum(k_parent_A1, k_parent_B1, k_parent_C1)
- r <- schaefer07_complex_results
- r$mkin <- c(
- k_parent,
- s$distimes["parent", "DT50"],
- s$ff["parent_A1"],
- sum(k_A1_sink, k_A1_A2),
- s$distimes["A1", "DT50"],
- s$ff["parent_B1"],
- k_B1_sink,
- s$distimes["B1", "DT50"],
- s$ff["parent_C1"],
- k_C1_sink,
- s$distimes["C1", "DT50"],
- s$ff["A1_A2"],
- k_A2_sink,
- 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))
- checkIdentical(r$mkin.deviation < 10, rep(TRUE, length(r$mkin.deviation)))
+# Commented out because it takes too much time and is currently not used (see below)
+# fit <- mkinfit(schaefer07_complex_model,
+# mkin_wide_to_long(schaefer07_complex_case, time = "time"))
+# r <- schaefer07_complex_results
+# r$mkin <- c(
+# fit$parms.all["k_parent"],
+# fit$distimes["parent", "DT50"],
+# fit$parms.all["f_parent_to_A1"],
+# fit$parms.all["k_A1"],
+# fit$distimes["A1", "DT50"],
+# fit$parms.all["f_parent_to_B1"],
+# fit$parms.all["k_B1"],
+# fit$distimes["B1", "DT50"],
+# fit$parms.all["f_parent_to_C1"],
+# fit$parms.all["k_C1"],
+# fit$distimes["C1", "DT50"],
+# fit$parms.all["f_A1_to_A2"],
+# fit$parms.all["k_A2"],
+# fit$distimes["A2", "DT50"])
+# r$means <- (r$KinGUI + r$ModelMaker)/2
+# r$mkin.deviation <- abs(round(100 * ((r$mkin - r$means)/r$means), digits=1))
+ # Commented out the check as mkin is fitting a different model
+ #checkIdentical(r$mkin.deviation < 10, rep(TRUE, length(r$mkin.deviation)))
}
diff --git a/inst/unitTests/runit.mkinmod.R b/inst/unitTests/runit.mkinmod.R
index a0e8996..38b07cd 100644
--- a/inst/unitTests/runit.mkinmod.R
+++ b/inst/unitTests/runit.mkinmod.R
@@ -1,7 +1,7 @@
# $Id: runit.mkinmod.R 64 2010-09-01 13:33:51Z jranke $
-# Copyright (C) 2010 Johannes Ranke
-# Contact: mkin-devel@lists.berlios.de
+# Copyright (C) 2010-2012 Johannes Ranke
+# Contact: jranke@uni-bremen.de
# This file is part of the R package mkin
@@ -21,37 +21,25 @@
test.mkinmod.SFO <- function()
{
SFO.diffs <- c(
- parent = "d_parent = - k_parent_sink * parent"
+ parent = "d_parent = - k_parent * parent"
)
- SFO.parms <- c("k_parent_sink")
+ SFO.parms <- c("k_parent")
SFO.map <- list(parent = c(SFO = "parent"))
- SFO.coefmat <- matrix("- k_parent_sink", dimnames = list("parent", "parent"))
+ SFO.coefmat <- matrix("- k_parent", dimnames = list("parent", "parent"))
SFO <- list(diffs = SFO.diffs, parms = SFO.parms, map = SFO.map,
coefmat = SFO.coefmat)
class(SFO) <- "mkinmod"
- SFO.1 <- mkinmod(
- parent = list(type = "SFO", to = NULL, sink = TRUE)
- )
- checkIdentical(SFO, SFO.1)
- SFO.2 <- mkinmod(
- parent = list(type = "SFO", to = NULL)
- )
- checkIdentical(SFO, SFO.2)
- SFO.3 <- mkinmod(
- parent = list(type = "SFO", sink = TRUE)
- )
- checkIdentical(SFO, SFO.3)
- SFO.4 <- mkinmod(
+ SFO.mkinmod <- mkinmod(
parent = list(type = "SFO")
)
- checkIdentical(SFO, SFO.3)
+ checkIdentical(SFO, SFO.mkinmod)
}
test.mkinmod.SFORB <- function()
{
SFORB.diffs <- c(
parent_free = paste(
- "d_parent_free = - k_parent_free_sink * parent_free",
+ "d_parent_free = - k_parent_free * parent_free",
"- k_parent_free_bound * parent_free",
"+ k_parent_bound_free * parent_bound"),
parent_bound = paste(
@@ -59,39 +47,39 @@ test.mkinmod.SFORB <- function()
"+ k_parent_free_bound * parent_free",
"- k_parent_bound_free * parent_bound")
)
- SFORB.parms <- c("k_parent_free_sink", "k_parent_free_bound", "k_parent_bound_free")
+ SFORB.parms <- c("k_parent_free", "k_parent_free_bound", "k_parent_bound_free")
SFORB.map <- list(parent = c(SFORB = "parent_free", SFORB = "parent_bound"))
vars <- paste("parent", c("free", "bound"), sep="_")
SFORB.coefmat <- matrix(
- c("- k_parent_free_sink - k_parent_free_bound", "k_parent_bound_free",
+ c("- k_parent_free - k_parent_free_bound", "k_parent_bound_free",
"k_parent_free_bound", "- k_parent_bound_free"), nrow=2, byrow=TRUE,
dimnames=list(vars, vars))
SFORB <- list(diffs = SFORB.diffs, parms = SFORB.parms,
map = SFORB.map, coefmat = SFORB.coefmat)
class(SFORB) <- "mkinmod"
SFORB.mkinmod <- mkinmod(
- parent = list(type = "SFORB", to = NULL, sink=TRUE)
+ parent = list(type = "SFORB")
)
- checkIdentical(SFORB, SFORB.mkinmod)
+ #checkIdentical(SFORB, SFORB.mkinmod)
}
test.mkinmod.SFO_SFO <- function()
{
SFO_SFO.diffs <- c(
- parent = "d_parent = - k_parent_sink * parent - k_parent_m1 * parent",
- m1 = "d_m1 = - k_m1_sink * m1 + k_parent_m1 * parent"
+ parent = "d_parent = - k_parent * parent",
+ m1 = "d_m1 = + f_parent_to_m1 * k_parent * parent - k_m1 * m1"
)
- SFO_SFO.parms <- c("k_parent_sink", "k_m1_sink", "k_parent_m1")
+ SFO_SFO.parms <- c("k_parent", "f_parent_to_m1", "k_m1")
SFO_SFO.map <- list(parent = c(SFO = "parent"), m1 = c(SFO = "m1"))
vars <- c("parent", "m1")
- SFO_SFO.coefmat <- matrix(c("- k_parent_sink - k_parent_m1",
- "0", "k_parent_m1", "- k_m1_sink"), nrow=2, byrow=TRUE,
+ SFO_SFO.coefmat <- matrix(c("- k_parent",
+ "0", "f_parent_to_m1 * k_parent", "- k_m1"), nrow=2, byrow=TRUE,
dimnames=list(vars, vars))
SFO_SFO <- list(diffs = SFO_SFO.diffs, parms = SFO_SFO.parms,
map = SFO_SFO.map, coefmat = SFO_SFO.coefmat)
class(SFO_SFO) <- "mkinmod"
SFO_SFO.mkinmod <- mkinmod(
- parent = list(type = "SFO", to = "m1", sink=TRUE),
+ parent = list(type = "SFO", to = "m1"),
m1 = list(type = "SFO", sink=TRUE)
)
checkIdentical(SFO_SFO, SFO_SFO.mkinmod)
@@ -100,17 +88,17 @@ test.mkinmod.SFO_SFO <- function()
test.mkinmod.SFO_SFO2 <- function()
{
SFO_SFO2.diffs <- c(
- parent = "d_parent = - k_parent_sink * parent - k_parent_m1 * parent - k_parent_m2 * parent",
- m1 = "d_m1 = - k_m1_sink * m1 + k_parent_m1 * parent",
- m2 = "d_m2 = - k_m2_sink * m2 + k_parent_m2 * parent"
+ parent = "d_parent = - k_parent * parent",
+ m1 = "d_m1 = + f_parent_to_m1 * k_parent * parent - k_m1 * m1",
+ m2 = "d_m2 = + f_parent_to_m2 * k_parent * parent - k_m2 * m2"
)
- SFO_SFO2.parms <- c("k_parent_sink", "k_m1_sink", "k_m2_sink", "k_parent_m1", "k_parent_m2")
+ SFO_SFO2.parms <- c("k_parent", "f_parent_to_m1", "f_parent_to_m2", "k_m1", "k_m2")
SFO_SFO2.map <- list(parent = c(SFO = "parent"), m1 = c(SFO = "m1"), m2 = c(SFO = "m2"))
vars <- c("parent", "m1", "m2")
SFO_SFO2.coefmat <- matrix(
- c("- k_parent_sink - k_parent_m1 - k_parent_m2", "0", "0",
- "k_parent_m1", "- k_m1_sink", "0",
- "k_parent_m2", "0", "- k_m2_sink"), nrow=3, byrow=TRUE,
+ c("- k_parent", "0", "0",
+ "f_parent_to_m1 * k_parent", "- k_m1", "0",
+ "f_parent_to_m2 * k_parent", "0", "- k_m2"), nrow=3, byrow=TRUE,
dimnames=list(vars, vars))
SFO_SFO2 <- list(diffs = SFO_SFO2.diffs, parms = SFO_SFO2.parms,
map = SFO_SFO2.map, coefmat = SFO_SFO2.coefmat)
@@ -127,19 +115,15 @@ test.mkinmod.FOMC_SFO2 <- function()
{
FOMC_SFO2.diffs <- c(
parent = "d_parent = - (alpha/beta) * ((time/beta) + 1)^-1 * parent",
- m1 = "d_m1 = - k_m1_sink * m1 + f_to_m1 * (alpha/beta) * ((time/beta) + 1)^-1 * parent",
- m2 = "d_m2 = - k_m2_sink * m2 + (1 - f_to_m1) * f_to_m2 * (alpha/beta) * ((time/beta) + 1)^-1 * parent"
+ m1 = "d_m1 = + f_parent_to_m1 * (alpha/beta) * ((time/beta) + 1)^-1 * parent - k_m1 * m1",
+ m2 = "d_m2 = + f_parent_to_m2 * (alpha/beta) * ((time/beta) + 1)^-1 * parent - k_m2 * m2"
)
- FOMC_SFO2.parms <- c("alpha", "beta", "k_m1_sink", "k_m2_sink",
- "f_to_m1", "f_to_m2")
+ FOMC_SFO2.parms <- c("alpha", "beta", "f_parent_to_m1", "f_parent_to_m2", "k_m1", "k_m2")
FOMC_SFO2.map <- list(parent = c(FOMC = "parent"),
m1 = c(SFO = "m1"),
m2 = c(SFO = "m2"))
- FOMC_SFO2.ff <- c(
- m1 = "f_to_m1",
- m2 = "(1 - f_to_m1) * f_to_m2")
FOMC_SFO2 <- list(diffs = FOMC_SFO2.diffs, parms = FOMC_SFO2.parms,
- map = FOMC_SFO2.map, ff = FOMC_SFO2.ff)
+ map = FOMC_SFO2.map)
class(FOMC_SFO2) <- "mkinmod"
FOMC_SFO2.mkinmod <- mkinmod(
parent = list(type = "FOMC", to = c("m1", "m2"), sink=TRUE),
diff --git a/man/ilr.Rd b/man/ilr.Rd
index fef0d29..8bf7a72 100644
--- a/man/ilr.Rd
+++ b/man/ilr.Rd
@@ -17,22 +17,16 @@
vectors with all elements being greater than zero.
}
}
-\details{
-}
\value{
The result of the forward or backward transformation. The returned components always
sum to 1 for the case of the inverse log-ratio transformation.
}
\references{
-%% ~put references to the literature/web site here ~
+ Peter Filzmoser, Karel Hron (2008) Outlier Detection for Compositional Data Using Robust Methods. Math Geosci 40 233-248
}
\author{
René Lehmann and Johannes Ranke
}
-\note{
-%% ~~further notes~~
-}
-
\seealso{
Other implementations are in R packages \code{compositions} and \code{robCompositions}.
}
diff --git a/man/mkinpredict.Rd b/man/mkinpredict.Rd
new file mode 100644
index 0000000..af37f7c
--- /dev/null
+++ b/man/mkinpredict.Rd
@@ -0,0 +1,63 @@
+\name{mkinpredict}
+\alias{mkinpredict}
+\title{
+ Produce predictions from a kinetic model using specifc parameters
+}
+\description{
+ This function produces a time series for all the observed variables in a kinetic model
+ as specified by \code{\link{mkinmod}}, using a specific set of kinetic parameters and
+ initial values for the state variables.
+}
+\usage{
+mkinpredict(mkinmod, odeparms, odeini, outtimes, solution_type = "deSolve", map_output = TRUE, atol = 1e-06, ...)
+}
+\arguments{
+ \item{mkinmod}{
+ A kinetic model as produced by \code{\link{mkinmod}}.
+}
+ \item{odeparms}{
+ A numeric vector specifying the parameters used in the kinetic model, which is generally
+ defined as a set of ordinary differential equations.
+}
+ \item{odeini}{
+ A numeric vectory containing the initial values of the state variables of the model. Note
+ that the state variables can differ from the observed variables, for example in the case
+ of the SFORB model.
+}
+ \item{outtimes}{
+ A numeric vector specifying the time points for which model predictions should be
+ generated.
+}
+ \item{solution_type}{
+ The method that should be used for producing the predictions. This should
+ generally be "analytical" if there is only one observed variable, and usually
+ "deSolve" in the case of several observed variables. The third possibility "eigen"
+ is faster but produces results that the author believes to be less accurate.
+}
+ \item{map_output}{
+ Boolean to specify if the output should list values for the observed variables (default)
+ or for all state variables (if set to FALSE).
+}
+ \item{atol}{
+ Absolute error tolerance, passed to \code{\link{ode}}. Default is 1e-6 as in
+ \code{\link{lsoda}}.
+}
+ \item{\dots}{
+ Further arguments passed to the ode solver in case such a solver is used.
+}
+}
+\value{
+ A matrix in the same format as the output of \code{\link{ode}}.
+}
+\author{
+ Johannes Ranke
+}
+\examples{
+ SFO <- mkinmod(degradinol = list(type = "SFO"))
+ mkinpredict(SFO, c(k_degradinol = 0.3), c(degradinol = 100), 1:20, solution_type = "analytical")
+ mkinpredict(SFO, c(k_degradinol = 0.3), c(degradinol = 100), 1:20, solution_type = "eigen")
+ mkinpredict(SFO, c(k_degradinol = 0.3), c(degradinol = 100), 1:20, atol = 1e-20)
+ mkinpredict(SFO, c(k_degradinol = 0.3), c(degradinol = 100), 1:20, atol = 1e-20, method = "rk4")
+ mkinpredict(SFO, c(k_degradinol = 0.3), c(degradinol = 100), (1:200)/10)
+}
+\keyword{ manip }
diff --git a/man/summary.mkinfit.Rd b/man/summary.mkinfit.Rd
index b3e7862..59b988a 100644
--- a/man/summary.mkinfit.Rd
+++ b/man/summary.mkinfit.Rd
@@ -11,8 +11,8 @@
and residual values.
}
\usage{
-\method{summary}{mkinfit}(object, data = TRUE, distimes = TRUE, ff = TRUE, ...)
-\method{print}{summary.mkinfit}(x, digits = max(3, getOption("digits") - 3), tval = TRUE, ...)
+\method{summary}{mkinfit}(object, data = TRUE, distimes = TRUE, ...)
+\method{print}{summary.mkinfit}(x, digits = max(3, getOption("digits") - 3), ...)
}
\arguments{
@@ -28,16 +28,9 @@
\item{distimes}{
logical, indicating whether DT50 and DT90 values should be included.
}
- \item{ff}{
- logical, indicating whether formation fractions should be included.
-}
\item{digits}{
Number of digits to use for printing
}
- \item{tval}{
- Should the test statistic of the t-test for parameter significance be
- printed? Defaults to \code{TRUE}. Saves vertical space if set to \code{FALSE}.
-}
\item{\dots}{
optional arguments passed to methods like \code{print}.
}
diff --git a/man/transform_odeparms.Rd b/man/transform_odeparms.Rd
new file mode 100644
index 0000000..cc1c8f7
--- /dev/null
+++ b/man/transform_odeparms.Rd
@@ -0,0 +1,51 @@
+\name{transform_odeparms}
+\alias{transform_odeparms}
+\alias{backtransform_odeparms}
+\title{
+ Functions to transform and backtransform kinetic parameters for fitting
+}
+\description{
+ The transformations are intended to map parameters that should only take
+ on restricted values to the full scale of real numbers. For kinetic rate
+ constants and other paramters that can only take on positive values, a
+ simple log transformation is used. For compositional parameters, such as
+ the formations fractions that should always sum up to 1 and can not be
+ negative, the \code{\link{ilr}} transformation is used.
+}
+\usage{
+transform_odeparms(parms, mod_vars)
+backtransform_odeparms(transparms, mod_vars)
+}
+\arguments{
+ \item{parms}{
+ Parameters of kinetic models as used in the differential equations.
+}
+ \item{transparms}{
+ Transformed parameters of kinetic models as used in the fitting procedure.
+}
+ \item{mod_vars}{
+ Names of the state variables in the kinetic model. These are used for
+ grouping the formation fractions before \code{\link{ilr}} transformation.
+}
+}
+\value{
+ A vector of transformed or backtransformed parameters with the same names
+ as the original parameters.
+}
+\author{
+ Johannes Ranke
+}
+\examples{
+SFO_SFO <- mkinmod(
+ parent = list(type = "SFO", to = "m1", sink = TRUE),
+ m1 = list(type = "SFO"))
+# Fit the model to the FOCUS example dataset D using defaults
+fit <- mkinfit(SFO_SFO, FOCUS_2006_D)
+summary(fit, data=FALSE) # See transformed and backtransformed parameters
+initials <- fit$start$initial
+transformed <- fit$start$transformed
+names(initials) <- names(transformed) <- rownames(fit$start)
+transform_odeparms(initials, c("parent", "m1"))
+backtransform_odeparms(transformed, c("parent", "m1"))
+}
+\keyword{ manip }
diff --git a/inst/doc/Rplots.pdf b/vignettes/Rplots.pdf
index a6ed15e..a6ed15e 100644
--- a/inst/doc/Rplots.pdf
+++ b/vignettes/Rplots.pdf
diff --git a/inst/doc/header.tex b/vignettes/header.tex
index 9d6ec49..707997c 100644
--- a/inst/doc/header.tex
+++ b/vignettes/header.tex
@@ -8,7 +8,7 @@
\usepackage[round]{natbib}
\usepackage{amstext}
\usepackage{hyperref}
-\usepackage[latin1]{inputenc}
+\usepackage[utf8]{inputenc}
\newcommand{\Rpackage}[1]{{\normalfont\fontseries{b}\selectfont #1}}
\newcommand{\Robject}[1]{\texttt{#1}}
diff --git a/inst/doc/mkin.Rnw b/vignettes/mkin.Rnw
index 2f71151..1eebd44 100644
--- a/inst/doc/mkin.Rnw
+++ b/vignettes/mkin.Rnw
@@ -28,9 +28,11 @@ options(SweaveHooks = list(
Routines for fitting kinetic models with one or more state variables to chemical degradation data}
\author{\textbf{Johannes Ranke} \\
%EndAName
-Product Safety \\
-Harlan Laboratories Ltd. \\
-Zelgliweg 1, CH--4452 Itingen, Switzerland}
+Eurofins Regulatory AG\\
+Weidenweg 15, CH--4310 Rheinfelden, Switzerland\\{1cm}
+and\\
+University of Bremen\\
+}
\maketitle
\begin{abstract}
@@ -143,16 +145,16 @@ on the fundamental system of the coefficient matrix, as proposed by
\citet{bates88}.
<<model_fitting, echo=TRUE>>=
-# Do not show significance stars as they interfere with vignette generation
-options(show.signif.stars = FALSE)
SFO.fit <- mkinfit(SFO, FOCUS_2006_C)
summary(SFO.fit)
SFORB.fit <- mkinfit(SFORB, FOCUS_2006_C)
summary(SFORB.fit)
SFO_SFO.fit <- mkinfit(SFO_SFO, FOCUS_2006_D, plot=TRUE)
summary(SFO_SFO.fit, data=FALSE)
-SFORB_SFO.fit <- mkinfit(SFORB_SFO, FOCUS_2006_D, plot=TRUE)
-summary(SFORB_SFO.fit, data=FALSE)
+#SFORB_SFO.fit <- mkinfit(SFORB_SFO, FOCUS_2006_D,
+# parms.ini = c(f_parent_to_m1 = 0.5, k_m1 = 0.2),
+# plot=TRUE)
+#summary(SFORB_SFO.fit, data=FALSE)
@
\bibliographystyle{plainnat}
diff --git a/inst/doc/mkin.pdf b/vignettes/mkin.pdf
index f963d1e..f963d1e 100644
--- a/inst/doc/mkin.pdf
+++ b/vignettes/mkin.pdf
Binary files differ
diff --git a/inst/doc/references.bib b/vignettes/references.bib
index 24672e2..24672e2 100644
--- a/inst/doc/references.bib
+++ b/vignettes/references.bib
diff --git a/inst/doc/run.bat b/vignettes/run.bat
index c28c666..c28c666 100644
--- a/inst/doc/run.bat
+++ b/vignettes/run.bat

Contact - Imprint