From 5f9645570d8308f48a492d48f38acd0d08f7d636 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Fri, 23 Nov 2018 20:01:28 +0100 Subject: Static documentation rebuilt by pkgdown --- NAMESPACE | 1 + _pkgdown.yml | 1 + docs/articles/FOCUS_D.html | 10 +- docs/articles/FOCUS_L.html | 44 +++--- docs/articles/mkin.html | 2 +- docs/articles/twa.html | 2 +- docs/articles/web_only/FOCUS_Z.html | 2 +- docs/articles/web_only/compiled_models.html | 12 +- docs/news/index.html | 8 +- docs/reference/Extract.mmkin.html | 12 +- docs/reference/index.html | 6 + docs/reference/logLik.mkinfit.html | 202 ++++++++++++++++++++++++++++ docs/reference/mccall81_245T.html | 12 +- docs/reference/mkinfit.html | 50 +++---- docs/reference/mkinmod.html | 2 +- docs/reference/mkinpredict.html | 6 +- docs/reference/mmkin.html | 4 +- docs/reference/summary.mkinfit.html | 6 +- docs/reference/transform_odeparms.html | 24 ++-- 19 files changed, 310 insertions(+), 96 deletions(-) create mode 100644 docs/reference/logLik.mkinfit.html diff --git a/NAMESPACE b/NAMESPACE index 764b4aff..aa03fc48 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -6,6 +6,7 @@ S3method(plot, mkinfit) S3method(summary, mkinfit) S3method(print, summary.mkinfit) S3method(plot, mmkin) +S3method(logLik, mmkin) S3method("[", mmkin) S3method(mkinpredict, mkinmod) S3method(mkinpredict, mkinfit) diff --git a/_pkgdown.yml b/_pkgdown.yml index 004e1139..4ff6ef8f 100644 --- a/_pkgdown.yml +++ b/_pkgdown.yml @@ -19,6 +19,7 @@ reference: - mkinparplot - endpoints - mkinerrmin + - logLik.mkinfit - title: Work with mmkin objects desc: Functions working with aggregated results contents: diff --git a/docs/articles/FOCUS_D.html b/docs/articles/FOCUS_D.html index b44462aa..b03e7612 100644 --- a/docs/articles/FOCUS_D.html +++ b/docs/articles/FOCUS_D.html @@ -84,7 +84,7 @@

Example evaluation of FOCUS Example Dataset D

Johannes Ranke

-

2018-09-18

+

2018-11-23

@@ -160,10 +160,10 @@

A comprehensive report of the results is obtained using the summary method for mkinfit objects.

summary(fit)
-
## mkin version used for fitting:    0.9.47.5 
+
## mkin version used for fitting:    0.9.47.6 
 ## R version used for fitting:       3.5.1 
-## Date of fit:     Fri Sep 14 17:17:43 2018 
-## Date of summary: Fri Sep 14 17:17:44 2018 
+## Date of fit:     Fri Nov 23 19:58:46 2018 
+## Date of summary: Fri Nov 23 19:58:47 2018 
 ## 
 ## Equations:
 ## d_parent/dt = - k_parent_sink * parent - k_parent_m1 * parent
@@ -171,7 +171,7 @@
 ## 
 ## Model predictions using solution type deSolve 
 ## 
-## Fitted with method Port using 153 model solutions performed in 0.645 s
+## Fitted with method Port using 153 model solutions performed in 0.736 s
 ## 
 ## Weighting: none
 ## 
diff --git a/docs/articles/FOCUS_L.html b/docs/articles/FOCUS_L.html
index ea49ae10..37b4306f 100644
--- a/docs/articles/FOCUS_L.html
+++ b/docs/articles/FOCUS_L.html
@@ -84,7 +84,7 @@
       

Example evaluation of FOCUS Laboratory Data L1 to L3

Johannes Ranke

-

2018-09-18

+

2018-11-23

@@ -110,15 +110,15 @@ summary(m.L1.SFO)
## mkin version used for fitting:    0.9.47.6 
 ## R version used for fitting:       3.5.1 
-## Date of fit:     Tue Sep 18 15:18:12 2018 
-## Date of summary: Tue Sep 18 15:18:12 2018 
+## Date of fit:     Fri Nov 23 19:58:49 2018 
+## Date of summary: Fri Nov 23 19:58:49 2018 
 ## 
 ## Equations:
 ## d_parent/dt = - k_parent_sink * parent
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted with method Port using 37 model solutions performed in 0.084 s
+## Fitted with method Port using 37 model solutions performed in 0.095 s
 ## 
 ## Weighting: none
 ## 
@@ -201,15 +201,15 @@
 
 
## mkin version used for fitting:    0.9.47.6 
 ## R version used for fitting:       3.5.1 
-## Date of fit:     Tue Sep 18 15:18:14 2018 
-## Date of summary: Tue Sep 18 15:18:14 2018 
+## Date of fit:     Fri Nov 23 19:58:51 2018 
+## Date of summary: Fri Nov 23 19:58:51 2018 
 ## 
 ## Equations:
 ## d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted with method Port using 611 model solutions performed in 1.321 s
+## Fitted with method Port using 611 model solutions performed in 1.464 s
 ## 
 ## Weighting: none
 ## 
@@ -296,15 +296,15 @@
 
 
## mkin version used for fitting:    0.9.47.6 
 ## R version used for fitting:       3.5.1 
-## Date of fit:     Tue Sep 18 15:18:14 2018 
-## Date of summary: Tue Sep 18 15:18:14 2018 
+## Date of fit:     Fri Nov 23 19:58:51 2018 
+## Date of summary: Fri Nov 23 19:58:51 2018 
 ## 
 ## Equations:
 ## d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted with method Port using 81 model solutions performed in 0.169 s
+## Fitted with method Port using 81 model solutions performed in 0.191 s
 ## 
 ## Weighting: none
 ## 
@@ -367,8 +367,8 @@
 
 
## mkin version used for fitting:    0.9.47.6 
 ## R version used for fitting:       3.5.1 
-## Date of fit:     Tue Sep 18 15:18:15 2018 
-## Date of summary: Tue Sep 18 15:18:15 2018 
+## Date of fit:     Fri Nov 23 19:58:52 2018 
+## Date of summary: Fri Nov 23 19:58:52 2018 
 ## 
 ## Equations:
 ## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) *
@@ -377,7 +377,7 @@
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted with method Port using 336 model solutions performed in 0.739 s
+## Fitted with method Port using 336 model solutions performed in 0.824 s
 ## 
 ## Weighting: none
 ## 
@@ -459,8 +459,8 @@
 
 
## mkin version used for fitting:    0.9.47.6 
 ## R version used for fitting:       3.5.1 
-## Date of fit:     Tue Sep 18 15:18:16 2018 
-## Date of summary: Tue Sep 18 15:18:16 2018 
+## Date of fit:     Fri Nov 23 19:58:53 2018 
+## Date of summary: Fri Nov 23 19:58:54 2018 
 ## 
 ## Equations:
 ## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) *
@@ -469,7 +469,7 @@
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted with method Port using 137 model solutions performed in 0.301 s
+## Fitted with method Port using 137 model solutions performed in 0.344 s
 ## 
 ## Weighting: none
 ## 
@@ -560,15 +560,15 @@
 
 
## mkin version used for fitting:    0.9.47.6 
 ## R version used for fitting:       3.5.1 
-## Date of fit:     Tue Sep 18 15:18:17 2018 
-## Date of summary: Tue Sep 18 15:18:17 2018 
+## Date of fit:     Fri Nov 23 19:58:54 2018 
+## Date of summary: Fri Nov 23 19:58:54 2018 
 ## 
 ## Equations:
 ## d_parent/dt = - k_parent_sink * parent
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted with method Port using 46 model solutions performed in 0.107 s
+## Fitted with method Port using 46 model solutions performed in 0.108 s
 ## 
 ## Weighting: none
 ## 
@@ -620,15 +620,15 @@
 
 
## mkin version used for fitting:    0.9.47.6 
 ## R version used for fitting:       3.5.1 
-## Date of fit:     Tue Sep 18 15:18:17 2018 
-## Date of summary: Tue Sep 18 15:18:17 2018 
+## Date of fit:     Fri Nov 23 19:58:54 2018 
+## Date of summary: Fri Nov 23 19:58:54 2018 
 ## 
 ## Equations:
 ## d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
 ## 
 ## Model predictions using solution type analytical 
 ## 
-## Fitted with method Port using 66 model solutions performed in 0.139 s
+## Fitted with method Port using 66 model solutions performed in 0.159 s
 ## 
 ## Weighting: none
 ## 
diff --git a/docs/articles/mkin.html b/docs/articles/mkin.html
index e483043b..4ead1062 100644
--- a/docs/articles/mkin.html
+++ b/docs/articles/mkin.html
@@ -84,7 +84,7 @@
       

Introduction to mkin

Johannes Ranke

-

2018-09-18

+

2018-11-23

diff --git a/docs/articles/twa.html b/docs/articles/twa.html index d9249f9d..8c053c10 100644 --- a/docs/articles/twa.html +++ b/docs/articles/twa.html @@ -84,7 +84,7 @@

Calculation of time weighted average concentrations with mkin

Johannes Ranke

-

2018-09-18

+

2018-11-23

diff --git a/docs/articles/web_only/FOCUS_Z.html b/docs/articles/web_only/FOCUS_Z.html index a3e743d1..5215e039 100644 --- a/docs/articles/web_only/FOCUS_Z.html +++ b/docs/articles/web_only/FOCUS_Z.html @@ -84,7 +84,7 @@

Example evaluation of FOCUS dataset Z

Johannes Ranke

-

2018-09-18

+

2018-11-23

diff --git a/docs/articles/web_only/compiled_models.html b/docs/articles/web_only/compiled_models.html index 684f28cb..85efff61 100644 --- a/docs/articles/web_only/compiled_models.html +++ b/docs/articles/web_only/compiled_models.html @@ -84,7 +84,7 @@

Performance benefit by using compiled model definitions in mkin

Johannes Ranke

-

2018-09-18

+

2018-11-23

@@ -125,9 +125,9 @@ }
## Lade nötiges Paket: rbenchmark
##                    test replications elapsed relative user.self sys.self
-## 3     deSolve, compiled            3   2.005    1.000     2.003        0
-## 1 deSolve, not compiled            3  15.480    7.721    15.474        0
-## 2      Eigenvalue based            3   2.460    1.227     2.459        0
+## 3     deSolve, compiled            3   2.284    1.000     2.282        0
+## 1 deSolve, not compiled            3  17.732    7.764    17.724        0
+## 2      Eigenvalue based            3   2.812    1.231     2.809        0
 ##   user.child sys.child
 ## 3          0         0
 ## 1          0         0
@@ -156,8 +156,8 @@
 }
## Successfully compiled differential equation model from auto-generated C code.
##                    test replications elapsed relative user.self sys.self
-## 2     deSolve, compiled            3   3.524     1.00     3.523    0.000
-## 1 deSolve, not compiled            3  33.021     9.37    33.001    0.004
+## 2     deSolve, compiled            3   4.029    1.000     4.026        0
+## 1 deSolve, not compiled            3  37.760    9.372    37.744        0
 ##   user.child sys.child
 ## 2          0         0
 ## 1          0         0
diff --git a/docs/news/index.html b/docs/news/index.html index a316612a..f3e57dd0 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -117,14 +117,16 @@ -
+

-mkin 0.9.47.6 (2018-09-18) Unreleased +mkin 0.9.47.6 (2018-09-21) Unreleased

  • ‘add_err’: Respect the argument giving the number of replicates in the synthetic dataset

  • ‘max_twa_parent’: Support maximum time weighted average concentration calculations for the hockey stick (HS) model

  • ‘mkinpredict’: Make the function generic and create a method for mkinfit objects

  • +
  • ‘mkinfit’: Improve the correctness of the fitted two component error model by fitting the mean absolute deviance at each observation against the observed values, weighting with the current two-component error model

  • +
  • ‘tests/testthat/test_irls.R’: Test if the components of the error model used to generate the data can be reproduced with moderate accuracy

@@ -668,7 +670,7 @@

Contents

#> Successfully compiled differential equation model from auto-generated C code.
fit.1 <- mkinfit(SFO_SFO_SFO, subset(mccall81_245T, soil == "Commerce"), quiet = TRUE) summary(fit.1, data = FALSE)
#> mkin version used for fitting: 0.9.47.6 #> R version used for fitting: 3.5.1 -#> Date of fit: Tue Sep 18 15:16:48 2018 -#> Date of summary: Tue Sep 18 15:16:48 2018 +#> Date of fit: Fri Nov 23 19:57:18 2018 +#> Date of summary: Fri Nov 23 19:57:18 2018 #> #> Equations: #> d_T245/dt = - k_T245_sink * T245 - k_T245_phenol * T245 @@ -169,7 +169,7 @@ #> #> Model predictions using solution type deSolve #> -#> Fitted with method Port using 574 model solutions performed in 3.602 s +#> Fitted with method Port using 574 model solutions performed in 3.661 s #> #> Weighting: none #> @@ -247,8 +247,8 @@ fixed_parms = "k_phenol_sink", quiet = TRUE) summary(fit.2, data = FALSE)
#> mkin version used for fitting: 0.9.47.6 #> R version used for fitting: 3.5.1 -#> Date of fit: Tue Sep 18 15:16:50 2018 -#> Date of summary: Tue Sep 18 15:16:50 2018 +#> Date of fit: Fri Nov 23 19:57:19 2018 +#> Date of summary: Fri Nov 23 19:57:19 2018 #> #> Equations: #> d_T245/dt = - k_T245_sink * T245 - k_T245_phenol * T245 @@ -258,7 +258,7 @@ #> #> Model predictions using solution type deSolve #> -#> Fitted with method Port using 246 model solutions performed in 1.513 s +#> Fitted with method Port using 246 model solutions performed in 1.549 s #> #> Weighting: none #> diff --git a/docs/reference/mkinfit.html b/docs/reference/mkinfit.html index 3c8442b6..9bbe3900 100644 --- a/docs/reference/mkinfit.html +++ b/docs/reference/mkinfit.html @@ -326,7 +326,7 @@ weight

only if err=NULL: how to weight the residuals, one of "none", "std", "mean", see details of modCost, or "tc" for the - two component error model. The option "manual" is available for + two component error model. The option "manual" is available for the case that err!=NULL, but it is not necessary to specify it.

@@ -406,6 +406,8 @@

Plotting methods plot.mkinfit and mkinparplot.

+

Comparisons of models fitted to the same data can be made using AIC + by virtue of the method logLik.mkinfit.

Fitting of several models to several datasets in a single call to mmkin.

@@ -434,15 +436,15 @@ fit <- mkinfit("FOMC", FOCUS_2006_C, quiet = TRUE) summary(fit)
#> mkin version used for fitting: 0.9.47.6 #> R version used for fitting: 3.5.1 -#> Date of fit: Tue Sep 18 15:16:52 2018 -#> Date of summary: Tue Sep 18 15:16:52 2018 +#> Date of fit: Fri Nov 23 19:57:22 2018 +#> Date of summary: Fri Nov 23 19:57:22 2018 #> #> Equations: #> d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent #> #> Model predictions using solution type analytical #> -#> Fitted with method Port using 64 model solutions performed in 0.158 s +#> Fitted with method Port using 64 model solutions performed in 0.155 s #> #> Weighting: none #> @@ -511,7 +513,7 @@ m1 = mkinsub("SFO"))
#> Successfully compiled differential equation model from auto-generated C code.
# Fit the model to the FOCUS example dataset D using defaults print(system.time(fit <- mkinfit(SFO_SFO, FOCUS_2006_D, solution_type = "eigen", quiet = TRUE)))
#> User System verstrichen -#> 1.011 0.000 1.012
coef(fit)
#> parent_0 log_k_parent_sink log_k_parent_m1 log_k_m1_sink +#> 0.995 0.000 0.995
coef(fit)
#> parent_0 log_k_parent_sink log_k_parent_m1 log_k_m1_sink #> 99.59848 -3.03822 -2.98030 -5.24750
#> $ff #> parent_sink parent_m1 m1_sink #> 0.485524 0.514476 1.000000 @@ -586,7 +588,7 @@ #> Model cost at call 146 : 371.2134 #> Optimisation by method Port successfully terminated. #> User System verstrichen -#> 0.755 0.000 0.755
coef(fit.deSolve)
#> parent_0 log_k_parent_sink log_k_parent_m1 log_k_m1_sink +#> 0.789 0.000 0.790
coef(fit.deSolve)
#> parent_0 log_k_parent_sink log_k_parent_m1 log_k_m1_sink #> 99.59848 -3.03822 -2.98030 -5.24750
endpoints(fit.deSolve)
#> $ff #> parent_sink parent_m1 m1_sink #> 0.485524 0.514476 1.000000 @@ -624,8 +626,8 @@ m1 = mkinsub("SFO"), use_of_ff = "max")
#> Successfully compiled differential equation model from auto-generated C code.
f.noweight <- mkinfit(SFO_SFO.ff, FOCUS_2006_D, quiet = TRUE) summary(f.noweight)
#> mkin version used for fitting: 0.9.47.6 #> R version used for fitting: 3.5.1 -#> Date of fit: Tue Sep 18 15:17:04 2018 -#> Date of summary: Tue Sep 18 15:17:04 2018 +#> Date of fit: Fri Nov 23 19:57:34 2018 +#> Date of summary: Fri Nov 23 19:57:34 2018 #> #> Equations: #> d_parent/dt = - k_parent * parent @@ -633,7 +635,7 @@ #> #> Model predictions using solution type deSolve #> -#> Fitted with method Port using 186 model solutions performed in 0.823 s +#> Fitted with method Port using 186 model solutions performed in 0.825 s #> #> Weighting: none #> @@ -741,8 +743,8 @@ #> 120 m1 33.31 28.78984 4.520e+00
f.irls <- mkinfit(SFO_SFO.ff, FOCUS_2006_D, reweight.method = "obs", quiet = TRUE) summary(f.irls)
#> mkin version used for fitting: 0.9.47.6 #> R version used for fitting: 3.5.1 -#> Date of fit: Tue Sep 18 15:17:06 2018 -#> Date of summary: Tue Sep 18 15:17:06 2018 +#> Date of fit: Fri Nov 23 19:57:36 2018 +#> Date of summary: Fri Nov 23 19:57:36 2018 #> #> Equations: #> d_parent/dt = - k_parent * parent @@ -750,7 +752,7 @@ #> #> Model predictions using solution type deSolve #> -#> Fitted with method Port using 551 model solutions performed in 2.374 s +#> Fitted with method Port using 551 model solutions performed in 2.528 s #> #> Weighting: none #> @@ -863,8 +865,8 @@ #> 120 m1 33.31 28.80898 4.501e+00 2.722
f.w.mean <- mkinfit(SFO_SFO.ff, FOCUS_2006_D, weight = "mean", quiet = TRUE) summary(f.w.mean)
#> mkin version used for fitting: 0.9.47.6 #> R version used for fitting: 3.5.1 -#> Date of fit: Tue Sep 18 15:17:07 2018 -#> Date of summary: Tue Sep 18 15:17:07 2018 +#> Date of fit: Fri Nov 23 19:57:37 2018 +#> Date of summary: Fri Nov 23 19:57:37 2018 #> #> Equations: #> d_parent/dt = - k_parent * parent @@ -872,7 +874,7 @@ #> #> Model predictions using solution type deSolve #> -#> Fitted with method Port using 155 model solutions performed in 0.636 s +#> Fitted with method Port using 155 model solutions performed in 0.687 s #> #> Weighting: mean #> @@ -981,8 +983,8 @@ quiet = TRUE) summary(f.w.value)
#> mkin version used for fitting: 0.9.47.6 #> R version used for fitting: 3.5.1 -#> Date of fit: Tue Sep 18 15:17:08 2018 -#> Date of summary: Tue Sep 18 15:17:08 2018 +#> Date of fit: Fri Nov 23 19:57:38 2018 +#> Date of summary: Fri Nov 23 19:57:38 2018 #> #> Equations: #> d_parent/dt = - k_parent * parent @@ -990,7 +992,7 @@ #> #> Model predictions using solution type deSolve #> -#> Fitted with method Port using 174 model solutions performed in 0.717 s +#> Fitted with method Port using 174 model solutions performed in 0.781 s #> #> Weighting: manual #> @@ -1101,8 +1103,8 @@ f.w.man <- mkinfit(SFO_SFO.ff, dw, err = "err.man", quiet = TRUE) summary(f.w.man)
#> mkin version used for fitting: 0.9.47.6 #> R version used for fitting: 3.5.1 -#> Date of fit: Tue Sep 18 15:17:09 2018 -#> Date of summary: Tue Sep 18 15:17:09 2018 +#> Date of fit: Fri Nov 23 19:57:39 2018 +#> Date of summary: Fri Nov 23 19:57:39 2018 #> #> Equations: #> d_parent/dt = - k_parent * parent @@ -1110,7 +1112,7 @@ #> #> Model predictions using solution type deSolve #> -#> Fitted with method Port using 270 model solutions performed in 1.181 s +#> Fitted with method Port using 270 model solutions performed in 1.201 s #> #> Weighting: manual #> @@ -1219,8 +1221,8 @@ reweight.method = "obs") summary(f.w.man.irls)
#> mkin version used for fitting: 0.9.47.6 #> R version used for fitting: 3.5.1 -#> Date of fit: Tue Sep 18 15:17:13 2018 -#> Date of summary: Tue Sep 18 15:17:13 2018 +#> Date of fit: Fri Nov 23 19:57:43 2018 +#> Date of summary: Fri Nov 23 19:57:43 2018 #> #> Equations: #> d_parent/dt = - k_parent * parent @@ -1228,7 +1230,7 @@ #> #> Model predictions using solution type deSolve #> -#> Fitted with method Port using 692 model solutions performed in 3.077 s +#> Fitted with method Port using 692 model solutions performed in 3.087 s #> #> Weighting: manual #> diff --git a/docs/reference/mkinmod.html b/docs/reference/mkinmod.html index af364403..3148efd8 100644 --- a/docs/reference/mkinmod.html +++ b/docs/reference/mkinmod.html @@ -229,7 +229,7 @@ For the definition of model types and their parameters, the equations given SFO_SFO <- mkinmod( parent = mkinsub("SFO", "m1"), m1 = mkinsub("SFO"), verbose = TRUE)
#> Compilation argument: -#> /usr/lib/R/bin/R CMD SHLIB file20267955fc75.c 2> file20267955fc75.c.err.txt +#> /usr/lib/R/bin/R CMD SHLIB file140043d42642.c 2> file140043d42642.c.err.txt #> Program source: #> 1: #include <R.h> #> 2: diff --git a/docs/reference/mkinpredict.html b/docs/reference/mkinpredict.html index 91e9289d..baa67000 100644 --- a/docs/reference/mkinpredict.html +++ b/docs/reference/mkinpredict.html @@ -323,17 +323,17 @@ c(parent = 100, m1 = 0), seq(0, 20, by = 0.1), solution_type = "eigen")[201,]))
#> time parent m1 #> 201 20 4.978707 27.46227
#> User System verstrichen -#> 0.003 0.000 0.004
system.time( +#> 0.004 0.000 0.004
system.time( print(mkinpredict(SFO_SFO, c(k_parent_m1 = 0.05, k_parent_sink = 0.1, k_m1_sink = 0.01), c(parent = 100, m1 = 0), seq(0, 20, by = 0.1), solution_type = "deSolve")[201,]))
#> time parent m1 #> 201 20 4.978707 27.46227
#> User System verstrichen -#> 0.002 0.000 0.001
system.time( +#> 0.002 0.000 0.002
system.time( print(mkinpredict(SFO_SFO, c(k_parent_m1 = 0.05, k_parent_sink = 0.1, k_m1_sink = 0.01), c(parent = 100, m1 = 0), seq(0, 20, by = 0.1), solution_type = "deSolve", use_compiled = FALSE)[201,]))
#> time parent m1 #> 201 20 4.978707 27.46227
#> User System verstrichen -#> 0.034 0.000 0.034
+#> 0.039 0.000 0.040
# Predict from a fitted model f <- mkinfit(SFO_SFO, FOCUS_2006_C)
#> Model cost at call 1 : 552.5739 #> Model cost at call 3 : 552.5739 diff --git a/docs/reference/mmkin.html b/docs/reference/mmkin.html index ad011b75..8bc7b18c 100644 --- a/docs/reference/mmkin.html +++ b/docs/reference/mmkin.html @@ -189,8 +189,8 @@ time_1 <- system.time(fits.4 <- mmkin(models, datasets, cores = 1, quiet = TRUE)) time_default
#> User System verstrichen -#> 0.054 0.027 6.836
time_1
#> User System verstrichen -#> 20.444 0.000 20.459
+#> 0.029 0.039 6.854
time_1
#> User System verstrichen +#> 22.091 0.000 22.106
endpoints(fits.0[["SFO_lin", 2]])
#> $ff #> parent_M1 parent_sink M1_M2 M1_sink #> 0.7340480 0.2659520 0.7505686 0.2494314 diff --git a/docs/reference/summary.mkinfit.html b/docs/reference/summary.mkinfit.html index f8e09b45..9428f187 100644 --- a/docs/reference/summary.mkinfit.html +++ b/docs/reference/summary.mkinfit.html @@ -206,15 +206,15 @@

Examples

summary(mkinfit(mkinmod(parent = mkinsub("SFO")), FOCUS_2006_A, quiet = TRUE))
#> mkin version used for fitting: 0.9.47.6 #> R version used for fitting: 3.5.1 -#> Date of fit: Tue Sep 18 15:17:59 2018 -#> Date of summary: Tue Sep 18 15:17:59 2018 +#> Date of fit: Fri Nov 23 19:58:33 2018 +#> Date of summary: Fri Nov 23 19:58:33 2018 #> #> Equations: #> d_parent/dt = - k_parent_sink * parent #> #> Model predictions using solution type analytical #> -#> Fitted with method Port using 35 model solutions performed in 0.071 s +#> Fitted with method Port using 35 model solutions performed in 0.081 s #> #> Weighting: none #> diff --git a/docs/reference/transform_odeparms.html b/docs/reference/transform_odeparms.html index f2602792..aa82269a 100644 --- a/docs/reference/transform_odeparms.html +++ b/docs/reference/transform_odeparms.html @@ -200,8 +200,8 @@ The transformation of sets of formation fractions is fragile, as it supposes fit <- mkinfit(SFO_SFO, FOCUS_2006_D, quiet = TRUE) summary(fit, data=FALSE) # See transformed and backtransformed parameters
#> mkin version used for fitting: 0.9.47.6 #> R version used for fitting: 3.5.1 -#> Date of fit: Tue Sep 18 15:18:06 2018 -#> Date of summary: Tue Sep 18 15:18:06 2018 +#> Date of fit: Fri Nov 23 19:58:40 2018 +#> Date of summary: Fri Nov 23 19:58:40 2018 #> #> Equations: #> d_parent/dt = - k_parent_sink * parent - k_parent_m1 * parent @@ -209,7 +209,7 @@ The transformation of sets of formation fractions is fragile, as it supposes #> #> Model predictions using solution type deSolve #> -#> Fitted with method Port using 153 model solutions performed in 0.662 s +#> Fitted with method Port using 153 model solutions performed in 0.688 s #> #> Weighting: none #> @@ -276,8 +276,8 @@ The transformation of sets of formation fractions is fragile, as it supposes
fit.2 <- mkinfit(SFO_SFO, FOCUS_2006_D, transform_rates = FALSE, quiet = TRUE) summary(fit.2, data=FALSE)
#> mkin version used for fitting: 0.9.47.6 #> R version used for fitting: 3.5.1 -#> Date of fit: Tue Sep 18 15:18:08 2018 -#> Date of summary: Tue Sep 18 15:18:08 2018 +#> Date of fit: Fri Nov 23 19:58:42 2018 +#> Date of summary: Fri Nov 23 19:58:42 2018 #> #> Equations: #> d_parent/dt = - k_parent_sink * parent - k_parent_m1 * parent @@ -285,7 +285,7 @@ The transformation of sets of formation fractions is fragile, as it supposes #> #> Model predictions using solution type deSolve #> -#> Fitted with method Port using 350 model solutions performed in 1.342 s +#> Fitted with method Port using 350 model solutions performed in 1.608 s #> #> Weighting: none #> @@ -364,8 +364,8 @@ The transformation of sets of formation fractions is fragile, as it supposes fit.ff <- mkinfit(SFO_SFO.ff, FOCUS_2006_D, quiet = TRUE) summary(fit.ff, data = FALSE)
#> mkin version used for fitting: 0.9.47.6 #> R version used for fitting: 3.5.1 -#> Date of fit: Tue Sep 18 15:18:09 2018 -#> Date of summary: Tue Sep 18 15:18:09 2018 +#> Date of fit: Fri Nov 23 19:58:43 2018 +#> Date of summary: Fri Nov 23 19:58:43 2018 #> #> Equations: #> d_parent/dt = - k_parent * parent @@ -373,7 +373,7 @@ The transformation of sets of formation fractions is fragile, as it supposes #> #> Model predictions using solution type deSolve #> -#> Fitted with method Port using 186 model solutions performed in 0.737 s +#> Fitted with method Port using 186 model solutions performed in 0.821 s #> #> Weighting: none #> @@ -448,8 +448,8 @@ The transformation of sets of formation fractions is fragile, as it supposes fit.ff.2 <- mkinfit(SFO_SFO.ff.2, FOCUS_2006_D, quiet = TRUE) summary(fit.ff.2, data = FALSE)
#> mkin version used for fitting: 0.9.47.6 #> R version used for fitting: 3.5.1 -#> Date of fit: Tue Sep 18 15:18:10 2018 -#> Date of summary: Tue Sep 18 15:18:10 2018 +#> Date of fit: Fri Nov 23 19:58:44 2018 +#> Date of summary: Fri Nov 23 19:58:44 2018 #> #> Equations: #> d_parent/dt = - k_parent * parent @@ -457,7 +457,7 @@ The transformation of sets of formation fractions is fragile, as it supposes #> #> Model predictions using solution type deSolve #> -#> Fitted with method Port using 104 model solutions performed in 0.414 s +#> Fitted with method Port using 104 model solutions performed in 0.46 s #> #> Weighting: none #> -- cgit v1.2.1