aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Ranke <johannes.ranke@jrwb.de>2025-02-13 14:50:06 +0100
committerJohannes Ranke <johannes.ranke@jrwb.de>2025-02-13 14:50:06 +0100
commit53391cdce906364ace5dfeb1380716425c60ee04 (patch)
tree761eaeffd04dc547f01a74211b92816d2f008cef
parent480c5cf42e07a7a62cf1afdb47c44ee2d04f120f (diff)
Update docs
-rw-r--r--docs/index.html4
-rw-r--r--log/build.log9
-rw-r--r--man/mkinpredict.Rd6
3 files changed, 4 insertions, 15 deletions
diff --git a/docs/index.html b/docs/index.html
index 8c1a7c59..1a3b4f81 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -9,8 +9,8 @@
<script src="deps/jquery-3.6.0/jquery-3.6.0.min.js"></script><meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link href="deps/bootstrap-5.2.2/bootstrap.min.css" rel="stylesheet">
<script src="deps/bootstrap-5.2.2/bootstrap.bundle.min.js"></script><!-- pkgdown --><script src="pkgdown.js"></script><meta property="og:title" content="Kinetic Evaluation of Chemical Degradation Data">
-<meta name="description" content="Calculation routines based on the FOCUS Kinetics Report (2006, 2014). Includes a function for conveniently defining differential equation models, model solution based on eigenvalues if possible or using numerical solvers. If a C compiler (on windows: Rtools) is installed, differential equation models are solved using automatically generated C functions. Inhomogeneous errors can be taken into account using variance by variable or two-component error models &lt;doi:10.3390/environments6120124&gt;. Hierarchical degradation models can be fitted using nonlinear mixed-effects model packages as a back end &lt;doi:10.3390/environments8080071&gt;. Please note that no warranty is implied for correctness of results or fitness for a particular purpose.">
-<meta property="og:description" content="Calculation routines based on the FOCUS Kinetics Report (2006, 2014). Includes a function for conveniently defining differential equation models, model solution based on eigenvalues if possible or using numerical solvers. If a C compiler (on windows: Rtools) is installed, differential equation models are solved using automatically generated C functions. Inhomogeneous errors can be taken into account using variance by variable or two-component error models &lt;doi:10.3390/environments6120124&gt;. Hierarchical degradation models can be fitted using nonlinear mixed-effects model packages as a back end &lt;doi:10.3390/environments8080071&gt;. Please note that no warranty is implied for correctness of results or fitness for a particular purpose.">
+<meta name="description" content="Calculation routines based on the FOCUS Kinetics Report (2006, 2014). Includes a function for conveniently defining differential equation models, model solution based on eigenvalues if possible or using numerical solvers. If a C compiler (on windows: Rtools) is installed, differential equation models are solved using automatically generated C functions. Non-constant errors can be taken into account using variance by variable or two-component error models &lt;doi:10.3390/environments6120124&gt;. Hierarchical degradation models can be fitted using nonlinear mixed-effects model packages as a back end &lt;doi:10.3390/environments8080071&gt;. Please note that no warranty is implied for correctness of results or fitness for a particular purpose.">
+<meta property="og:description" content="Calculation routines based on the FOCUS Kinetics Report (2006, 2014). Includes a function for conveniently defining differential equation models, model solution based on eigenvalues if possible or using numerical solvers. If a C compiler (on windows: Rtools) is installed, differential equation models are solved using automatically generated C functions. Non-constant errors can be taken into account using variance by variable or two-component error models &lt;doi:10.3390/environments6120124&gt;. Hierarchical degradation models can be fitted using nonlinear mixed-effects model packages as a back end &lt;doi:10.3390/environments8080071&gt;. Please note that no warranty is implied for correctness of results or fitness for a particular purpose.">
</head>
<body>
<a href="#main" class="visually-hidden-focusable">Skip to contents</a>
diff --git a/log/build.log b/log/build.log
index ce7cc8e1..a02e93ae 100644
--- a/log/build.log
+++ b/log/build.log
@@ -2,11 +2,4 @@
* preparing ‘mkin’:
* checking DESCRIPTION meta-information ... OK
* installing the package to build vignettes
-* creating vignettes ... OK
-* checking for LF line-endings in source and make files and shell scripts
-* checking for empty or unneeded directories
-Removed empty directory ‘mkin/vignettes/web_only’
-* building ‘mkin_1.2.9.tar.gz’
-Warning: invalid uid value replaced by that for user 'nobody'
-Warning: invalid gid value replaced by that for user 'nobody'
-
+* creating vignettes ... \ No newline at end of file
diff --git a/man/mkinpredict.Rd b/man/mkinpredict.Rd
index a4821705..f68f6c7a 100644
--- a/man/mkinpredict.Rd
+++ b/man/mkinpredict.Rd
@@ -71,7 +71,7 @@ parent compound.}
\item{use_symbols}{If set to \code{TRUE} (default), symbol info present in
the \link{mkinmod} object is used if available for accessing compiled code}
-\item{method.ode}{The solution method passed via \link{mkinpredict} to \link[deSolve:ode]{deSolve::ode}] in
+\item{method.ode}{The solution method passed via \link{mkinpredict} to \code{deSolve::ode()} in
case the solution type is "deSolve" and we are not using compiled code.
When using compiled code, only lsoda is supported.}
@@ -86,11 +86,7 @@ the observed variables (default) or for all state variables (if set to
FALSE). Setting this to FALSE has no effect for analytical solutions,
as these always return mapped output.}
-<<<<<<< HEAD
-\item{na_stop}{Should it be an error if \link[deSolve:ode]{deSolve::ode} returns NaN values}
-=======
\item{na_stop}{Should it be an error if \code{deSolve::ode()} returns NaN values}
->>>>>>> devel
}
\value{
A matrix with the numeric solution in wide format

Contact - Imprint