- Fixed the example in the mkinmod documentation

- Fixed the vignette
- Did not fix the unit tests for mkinmod yet



git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@31 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

1 files changed, 11 insertions, 5 deletions

diff --git a/man/mkinpredict.Rd b/man/mkinpredict.Rd
index af37f7c..aaa77e6 100644
--- a/man/mkinpredict.Rd
+++ b/man/mkinpredict.Rd
@@ -54,10 +54,16 @@ mkinpredict(mkinmod, odeparms, odeini, outtimes, solution_type = "deSolve", map_
 }
 \examples{
   SFO <- mkinmod(degradinol = list(type = "SFO"))
-  mkinpredict(SFO, c(k_degradinol = 0.3), c(degradinol = 100), 1:20, solution_type = "analytical")
-  mkinpredict(SFO, c(k_degradinol = 0.3), c(degradinol = 100), 1:20, solution_type = "eigen")
-  mkinpredict(SFO, c(k_degradinol = 0.3), c(degradinol = 100), 1:20, atol = 1e-20)
-  mkinpredict(SFO, c(k_degradinol = 0.3), c(degradinol = 100), 1:20, atol = 1e-20, method = "rk4")
-  mkinpredict(SFO, c(k_degradinol = 0.3), c(degradinol = 100), (1:200)/10)
+  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,]
+  # 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 = "bdf")[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 does make a lot of difference
+  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 }