diff options
| author | jranke <jranke@edb9625f-4e0d-4859-8d74-9fd3b1da38cb> | 2010-05-31 21:17:58 +0000 |
|---|---|---|
| committer | jranke <jranke@edb9625f-4e0d-4859-8d74-9fd3b1da38cb> | 2010-05-31 21:17:58 +0000 |
| commit | fb014522ddc1057e85d3c08ab2cd753bd79bd857 (patch) | |
| tree | dd01e9cb32c8e1837ce5a4d7dd9f2b42bca17cee /R/mkinfit.R | |
| parent | a4421eba19eae98a0bd00adb4e8c6d72cc49f9fb (diff) | |
- Added a test based on the KinGUI paper "complex case"
- Fix the DT50 calculation for the SFORB model
- Added a bit more of a description
git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@11 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
Diffstat (limited to 'R/mkinfit.R')
| -rw-r--r-- | R/mkinfit.R | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/R/mkinfit.R b/R/mkinfit.R index 9e872fc..f8285fc 100644 --- a/R/mkinfit.R +++ b/R/mkinfit.R @@ -188,9 +188,9 @@ mkinfit <- function(mkinmod, observed, # FOCUS kinetics (2006), p. 60 f
k_out_names = grep(paste("k", obs_var, "free", sep="_"), names(parms.all), value=TRUE)
k_out_names = setdiff(k_out_names, paste("k", obs_var, "free", "bound", sep="_"))
- k_1output = sum(parms.all[[k_out_names]])
- k_12 = parms.all[[paste("k", obs_var, "free", "bound", sep="_")]]
- k_21 = parms.all[[paste("k", obs_var, "bound", "free", sep="_")]]
+ k_1output = sum(parms.all[k_out_names])
+ k_12 = parms.all[paste("k", obs_var, "free", "bound", sep="_")]
+ k_21 = parms.all[paste("k", obs_var, "bound", "free", sep="_")]
sqrt_exp = sqrt(1/4 * (k_12 + k_21 + k_1output)^2 + k_12 * k_21 - (k_12 + k_1output) * k_21)
b1 = 0.5 * (k_12 + k_21 + k_1output) + sqrt_exp
|