aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjranke <jranke@edb9625f-4e0d-4859-8d74-9fd3b1da38cb>2013-09-25 09:18:52 +0000
committerjranke <jranke@edb9625f-4e0d-4859-8d74-9fd3b1da38cb>2013-09-25 09:18:52 +0000
commit5da266adcf184c7922fd595eda24599621f92565 (patch)
tree442d9b4322d789400448ce9b40f828aee3a4f782
parente8692bf693b5081bf7c10c67c47fad680bad4b44 (diff)
- Fixed the NOTES listed by R CMD check
Candidate for publication on CRAN git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@97 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
-rw-r--r--DESCRIPTION4
-rw-r--r--NAMESPACE6
-rw-r--r--inst/GUI/mkinGUItest.RDatabin169 -> 0 bytes
-rw-r--r--man/mkinpredict.Rd33
4 files changed, 26 insertions, 17 deletions
diff --git a/DESCRIPTION b/DESCRIPTION
index 52112e94..21a54286 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -3,8 +3,8 @@ Type: Package
Title: Routines for fitting kinetic models with one or more state
variables to chemical degradation data
Version: 0.9-20
-Date: 2013-09-
-Author: Johannes Ranke, Katrin Lindenberger, René Lehmann
+Date: 2013-09-25
+Author: Johannes Ranke, with contributions from Katrin Lindenberger, René Lehmann
Maintainer: Johannes Ranke <jranke@uni-bremen.de>
Description: Calculation routines based on the FOCUS Kinetics Report (2006).
Includes a function for conveniently defining differential equation models,
diff --git a/NAMESPACE b/NAMESPACE
index c9b7ce34..41282134 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -1,11 +1,9 @@
-# Default NAMESPACE created by R
-# Remove the previous line if you edit this file
-
# Export all names
exportPattern(".")
# Import all packages listed as Imports or Depends
import(
FME,
- deSolve
+ deSolve,
+ minpack.lm
)
diff --git a/inst/GUI/mkinGUItest.RData b/inst/GUI/mkinGUItest.RData
deleted file mode 100644
index 82b7086d..00000000
--- a/inst/GUI/mkinGUItest.RData
+++ /dev/null
Binary files differ
diff --git a/man/mkinpredict.Rd b/man/mkinpredict.Rd
index 66e3ce55..9d181f51 100644
--- a/man/mkinpredict.Rd
+++ b/man/mkinpredict.Rd
@@ -9,8 +9,8 @@
initial values for the state variables.
}
\usage{
- mkinpredict(mkinmod, odeparms, odeini, outtimes, solution_type = "deSolve", map_output = TRUE,
- atol = 1e-08, rtol = 1e-10, ...)
+ mkinpredict(mkinmod, odeparms, odeini, outtimes, solution_type = "deSolve",
+ map_output = TRUE, atol = 1e-08, rtol = 1e-10, ...)
}
\arguments{
\item{mkinmod}{
@@ -59,16 +59,27 @@
}
\examples{
SFO <- mkinmod(degradinol = list(type = "SFO"))
- mkinpredict(SFO, c(k_degradinol_sink = 0.3), c(degradinol = 100), 0:20, solution_type = "analytical")
- mkinpredict(SFO, c(k_degradinol_sink = 0.3), c(degradinol = 100), 0:20, solution_type = "eigen")
+ mkinpredict(SFO, c(k_degradinol_sink = 0.3), c(degradinol = 100), 0:20,
+ solution_type = "analytical")
+ mkinpredict(SFO, c(k_degradinol_sink = 0.3), c(degradinol = 100), 0:20,
+ solution_type = "eigen")
+
+ mkinpredict(SFO, c(k_degradinol_sink = 0.3), c(degradinol = 100), 1:20,
+ solution_type = "analytical")[20,]
+ mkinpredict(SFO, c(k_degradinol_sink = 0.3), c(degradinol = 100), 0:20,
+ atol = 1e-20)[20,]
- mkinpredict(SFO, c(k_degradinol_sink = 0.3), c(degradinol = 100), 1:20, solution_type = "analytical")[20,]
- mkinpredict(SFO, c(k_degradinol_sink = 0.3), c(degradinol = 100), 0:20, atol = 1e-20)[20,]
# The integration method does not make a lot of difference
- mkinpredict(SFO, c(k_degradinol_sink = 0.3), c(degradinol = 100), 0:20, atol = 1e-20, method = "ode45")[20,]
- mkinpredict(SFO, c(k_degradinol_sink = 0.3), c(degradinol = 100), 0:20, atol = 1e-20, method = "rk4")[20,]
- # The number of output times used to make a lot of difference until the default for atol was adjusted
- mkinpredict(SFO, c(k_degradinol_sink = 0.3), c(degradinol = 100), seq(0, 20, by = 0.1))[201,]
- mkinpredict(SFO, c(k_degradinol_sink = 0.3), c(degradinol = 100), seq(0, 20, by = 0.01))[2001,]
+ mkinpredict(SFO, c(k_degradinol_sink = 0.3), c(degradinol = 100), 0:20, atol = 1e-20,
+ method = "ode45")[20,]
+ mkinpredict(SFO, c(k_degradinol_sink = 0.3), c(degradinol = 100), 0:20, atol = 1e-20,
+ method = "rk4")[20,]
+
+ # The number of output times used to make a lot of difference until the
+ # default for atol was adjusted
+ mkinpredict(SFO, c(k_degradinol_sink = 0.3), c(degradinol = 100),
+ seq(0, 20, by = 0.1))[201,]
+ mkinpredict(SFO, c(k_degradinol_sink = 0.3), c(degradinol = 100),
+ seq(0, 20, by = 0.01))[2001,]
}
\keyword{ manip }

Contact - Imprint