From db9ae6a0c9cecb92048fde6f06af1da183c09b5f Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Thu, 19 Nov 2020 15:41:24 +0100 Subject: Depend on parallel, doc improvements By depending on parallel instead of importing it, functions to set up and stop a cluster are always available when mkin is loaded. The use of multicore processing in mmkin on Windows is now documented in the help file, which brings mkin closer to a version 1.0 #9. --- docs/dev/reference/mkinfit.html | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'docs/dev/reference/mkinfit.html') diff --git a/docs/dev/reference/mkinfit.html b/docs/dev/reference/mkinfit.html index b46c2cce..f5a913b2 100644 --- a/docs/dev/reference/mkinfit.html +++ b/docs/dev/reference/mkinfit.html @@ -432,15 +432,15 @@ Degradation Data. Environments 6(12) 124 summary(fit)
#> mkin version used for fitting: 0.9.50.4 #> R version used for fitting: 4.0.3 -#> Date of fit: Thu Nov 5 23:14:40 2020 -#> Date of summary: Thu Nov 5 23:14:40 2020 +#> Date of fit: Thu Nov 19 14:49:38 2020 +#> Date of summary: Thu Nov 19 14:49:38 2020 #> #> Equations: #> d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent #> #> Model predictions using solution type analytical #> -#> Fitted using 222 model solutions performed in 0.05 s +#> Fitted using 222 model solutions performed in 0.045 s #> #> Error model: Constant variance #> @@ -573,10 +573,10 @@ Degradation Data. Environments 6(12) 124 analytical = mkinfit(SFO_SFO, FOCUS_D, quiet = TRUE, error_model = "tc", solution_type = "analytical")) } -
#> Loading required package: rbenchmark
#> test relative elapsed -#> 3 analytical 1.000 0.532 -#> 1 deSolve_compiled 1.765 0.939 -#> 2 eigen 2.229 1.186
# } +
#> test relative elapsed +#> 3 analytical 1.000 0.534 +#> 1 deSolve_compiled 1.908 1.019 +#> 2 eigen 2.238 1.195
# } # Use stepwise fitting, using optimised parameters from parent only fit, FOMC-SFO # \dontrun{ @@ -600,8 +600,8 @@ Degradation Data. Environments 6(12) 124 summary(fit.FOMC_SFO.tc, data = FALSE)
#> Warning: NaNs produced
#> Warning: NaNs produced
#> Warning: NaNs produced
#> Warning: diag(.) had 0 or NA entries; non-finite result is doubtful
#> mkin version used for fitting: 0.9.50.4 #> R version used for fitting: 4.0.3 -#> Date of fit: Thu Nov 5 23:14:51 2020 -#> Date of summary: Thu Nov 5 23:14:51 2020 +#> Date of fit: Thu Nov 19 14:49:49 2020 +#> Date of summary: Thu Nov 19 14:49:49 2020 #> #> Equations: #> d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent @@ -610,7 +610,7 @@ Degradation Data. Environments 6(12) 124 #> #> Model predictions using solution type deSolve #> -#> Fitted using 4273 model solutions performed in 3.081 s +#> Fitted using 4273 model solutions performed in 3.1 s #> #> Error model: Two-component variance function #> -- cgit v1.2.1