aboutsummaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorJohannes Ranke <jranke@uni-bremen.de>2020-04-15 20:42:29 +0200
committerJohannes Ranke <jranke@uni-bremen.de>2020-04-15 20:42:29 +0200
commitd518c4cfa22994db5ba81a6b01c6cb4c4186872e (patch)
treecc5cfb591981d46f084ad4c0d21e548b5b4c1be6 /man
parent42171ba55222383a0d47e5aacd46a972819e7812 (diff)
Adapt endpoint() to also work for nlme.mmkin objects
Diffstat (limited to 'man')
-rw-r--r--man/endpoints.Rd12
-rw-r--r--man/nlme.mmkin.Rd5
2 files changed, 15 insertions, 2 deletions
diff --git a/man/endpoints.Rd b/man/endpoints.Rd
index be180737..26b5ee08 100644
--- a/man/endpoints.Rd
+++ b/man/endpoints.Rd
@@ -8,10 +8,14 @@ with mkinfit}
endpoints(fit)
}
\arguments{
-\item{fit}{An object of class \code{\link{mkinfit}}.}
+\item{fit}{An object of class \code{\link{mkinfit}} or
+\code{\link{nlme.mmkin}}}
}
\value{
-A list with the components mentioned above.
+A list with a matrix of dissipation times named distimes,
+ and, if applicable, a vector of formation fractions named ff
+ and, if the SFORB model was in use, a vector of eigenvalues
+ of these SFORB models, equivalent to DFOP rate constants
}
\description{
This function calculates DT50 and DT90 values as well as formation fractions
@@ -27,6 +31,10 @@ The function is used internally by \code{\link{summary.mkinfit}}.
fit <- mkinfit("FOMC", FOCUS_2006_C, quiet = TRUE)
endpoints(fit)
+ \dontrun{
+ fit_2 <- mkinfit("SFORB", FOCUS_2006_C, quiet = TRUE)
+ endpoints(fit_2)
+ }
}
\author{
diff --git a/man/nlme.mmkin.Rd b/man/nlme.mmkin.Rd
index 26dcce66..97d444e4 100644
--- a/man/nlme.mmkin.Rd
+++ b/man/nlme.mmkin.Rd
@@ -79,8 +79,10 @@ ds <- lapply(experimental_data_for_UBA_2019[6:10],
function(x) subset(x$data[c("name", "time", "value")], name == "parent"))
f <- mmkin("SFO", ds, quiet = TRUE, cores = 1)
library(nlme)
+endpoints(f[[1]])
f_nlme <- nlme(f)
print(f_nlme)
+endpoints(f_nlme)
f_nlme_2 <- nlme(f, start = c(parent_0 = 100, log_k_parent_sink = 0.1))
update(f_nlme_2, random = parent_0 ~ 1)
\dontrun{
@@ -125,6 +127,9 @@ update(f_nlme_2, random = parent_0 ~ 1)
anova(f_nlme_dfop_sfo, f_nlme_fomc_sfo, f_nlme_sfo_sfo)
anova(f_nlme_dfop_sfo, f_nlme_sfo_sfo) # if we ignore FOMC
+
+ endpoints(f_nlme_sfo_sfo)
+ endpoints(f_nlme_dfop_sfo)
}
}
\seealso{

Contact - Imprint