From f9343a9f401dce52188fceec456865ba4f2eb95f Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Tue, 8 Nov 2022 07:26:57 +0100 Subject: Simplify SFORB analytical solution, whitespace I do not know why the formulae for b1 and b2 on page 64 of FOCUS kinetics (2014) were not simplified. Clearly, the term k12 * k21 - (k12 + k1output) * k21) can be simplified to - k1output * k21 The test for equivalence of DFOP and SFORB fits verifies that the change is OK. I also removed trailing whitespaces, substituted tab characters by two whitespaces and removed indenting of text in paragraphs describing parameters in roxygen comments to unify formatting. --- man/FOMC.solution.Rd | 4 ++-- man/IORE.solution.Rd | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'man') diff --git a/man/FOMC.solution.Rd b/man/FOMC.solution.Rd index eeee85f9..d645113c 100644 --- a/man/FOMC.solution.Rd +++ b/man/FOMC.solution.Rd @@ -30,8 +30,8 @@ in the original equation. } \note{ The solution of the FOMC kinetic model reduces to the -\code{\link{SFO.solution}} for large values of \code{alpha} and -\code{beta} with \eqn{k = \frac{\beta}{\alpha}}{k = beta/alpha}. +\code{\link{SFO.solution}} for large values of \code{alpha} and \code{beta} +with \eqn{k = \frac{\beta}{\alpha}}{k = beta/alpha}. } \examples{ diff --git a/man/IORE.solution.Rd b/man/IORE.solution.Rd index 1150f023..5d0126a7 100644 --- a/man/IORE.solution.Rd +++ b/man/IORE.solution.Rd @@ -37,9 +37,9 @@ guidance for details. fit.iore <- mkinfit("IORE", FOCUS_2006_C, quiet = TRUE) fit.iore.deS <- mkinfit("IORE", FOCUS_2006_C, solution_type = "deSolve", quiet = TRUE) - print(data.frame(fit.fomc$par, fit.iore$par, fit.iore.deS$par, + print(data.frame(fit.fomc$par, fit.iore$par, fit.iore.deS$par, row.names = paste("model par", 1:4))) - print(rbind(fomc = endpoints(fit.fomc)$distimes, iore = endpoints(fit.iore)$distimes, + print(rbind(fomc = endpoints(fit.fomc)$distimes, iore = endpoints(fit.iore)$distimes, iore.deS = endpoints(fit.iore)$distimes)) } -- cgit v1.2.1