From 282f88f9e28e683f524d5e05d65d8b18ab856a8d Mon Sep 17 00:00:00 2001
From: Johannes Ranke Here we get a performance benefit of a factor of 10 using the version of the differential equation model compiled from C code! Here we get a performance benefit of a factor of 9 using the version of the differential equation model compiled from C code! This vignette was built with mkin 0.9.47.6 on## mkin version used for fitting: 0.9.47.6
## R version used for fitting: 3.5.1
-## Date of fit: Mon Nov 26 09:29:29 2018
-## Date of summary: Mon Nov 26 09:29:29 2018
+## Date of fit: Mon Nov 26 09:47:23 2018
+## Date of summary: Mon Nov 26 09:47:23 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.094 s
+## Fitted with method Port using 37 model solutions performed in 0.093 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: Mon Nov 26 09:29:30 2018
-## Date of summary: Mon Nov 26 09:29:30 2018
+## Date of fit: Mon Nov 26 09:47:25 2018
+## Date of summary: Mon Nov 26 09:47:25 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.467 s
+## Fitted with method Port using 611 model solutions performed in 1.475 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: Mon Nov 26 09:29:31 2018
-## Date of summary: Mon Nov 26 09:29:31 2018
+## Date of fit: Mon Nov 26 09:47:26 2018
+## Date of summary: Mon Nov 26 09:47:26 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.191 s
+## Fitted with method Port using 81 model solutions performed in 0.192 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: Mon Nov 26 09:29:32 2018
-## Date of summary: Mon Nov 26 09:29:32 2018
+## Date of fit: Mon Nov 26 09:47:27 2018
+## Date of summary: Mon Nov 26 09:47:27 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.828 s
+## Fitted with method Port using 336 model solutions performed in 0.831 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: Mon Nov 26 09:29:33 2018
-## Date of summary: Mon Nov 26 09:29:33 2018
+## Date of fit: Mon Nov 26 09:47:28 2018
+## Date of summary: Mon Nov 26 09:47:28 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.334 s
+## Fitted with method Port using 137 model solutions performed in 0.336 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: Mon Nov 26 09:29:34 2018
-## Date of summary: Mon Nov 26 09:29:34 2018
+## Date of fit: Mon Nov 26 09:47:28 2018
+## Date of summary: Mon Nov 26 09:47:29 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.108 s
+## Fitted with method Port using 46 model solutions performed in 0.107 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: Mon Nov 26 09:29:34 2018
-## Date of summary: Mon Nov 26 09:29:34 2018
+## Date of fit: Mon Nov 26 09:47:28 2018
+## Date of summary: Mon Nov 26 09:47:29 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.158 s
+## Fitted with method Port using 66 model solutions performed in 0.168 s
##
## Weighting: none
##
diff --git a/docs/articles/web_only/compiled_models.html b/docs/articles/web_only/compiled_models.html
index 93c800bf..083cdb79 100644
--- a/docs/articles/web_only/compiled_models.html
+++ b/docs/articles/web_only/compiled_models.html
@@ -125,9 +125,9 @@
}
## Lade nötiges Paket: rbenchmark
## test replications elapsed relative user.self sys.self
-## 3 deSolve, compiled 3 2.268 1.000 2.267 0
-## 1 deSolve, not compiled 3 18.698 8.244 18.690 0
-## 2 Eigenvalue based 3 2.812 1.240 2.811 0
+## 3 deSolve, compiled 3 2.264 1.000 2.263 0
+## 1 deSolve, not compiled 3 17.642 7.792 17.634 0
+## 2 Eigenvalue based 3 2.801 1.237 2.799 0
## user.child sys.child
## 3 0 0
## 1 0 0
@@ -156,12 +156,12 @@
}
## Successfully compiled differential equation model from auto-generated C code.
-## test replications elapsed relative user.self sys.self
-## 2 deSolve, compiled 3 4.032 1.000 4.028 0
-## 1 deSolve, not compiled 3 39.759 9.861 39.741 0
+## 2 deSolve, compiled 3 4.012 1.000 4.010 0
+## 1 deSolve, not compiled 3 37.606 9.373 37.589 0
## user.child sys.child
## 2 0 0
## 1 0 0
## R version 3.5.1 (2018-07-02)
## Platform: x86_64-pc-linux-gnu (64-bit)
diff --git a/docs/reference/Extract.mmkin.html b/docs/reference/Extract.mmkin.html
index 33d90e5b..51da42fc 100644
--- a/docs/reference/Extract.mmkin.html
+++ b/docs/reference/Extract.mmkin.html
@@ -278,7 +278,7 @@
#>
#> $time
#> User System verstrichen
-#> 0.182 0.000 0.183
+#> 0.183 0.000 0.183
#>
#> $mkinmod
#> <mkinmod> model generated with
@@ -467,8 +467,8 @@
#> }
#> return(mC)
#> }
-#> <bytecode: 0x55555be42410>
-#> <environment: 0x55555bc697f8>
+#> <bytecode: 0x55555be28e50>
+#> <environment: 0x55555bc4d2b0>
#>
#> $cost_notrans
#> function (P)
@@ -490,8 +490,8 @@
#> scaleVar = scaleVar)
#> return(mC)
#> }
-#> <bytecode: 0x55555cd2ca88>
-#> <environment: 0x55555bc697f8>
+#> <bytecode: 0x55555cd2fbb8>
+#> <environment: 0x55555bc4d2b0>
#>
#> $hessian_notrans
#> parent_0 k_parent_sink
@@ -558,7 +558,7 @@
#> 99.17407
#>
#> $date
-#> [1] "Mon Nov 26 09:27:40 2018"
+#> [1] "Mon Nov 26 09:45:35 2018"
#>
#> $version
#> [1] "0.9.47.6"
diff --git a/docs/reference/logLik.mkinfit.html b/docs/reference/logLik.mkinfit.html
index 5fd6c6d7..b1901703 100644
--- a/docs/reference/logLik.mkinfit.html
+++ b/docs/reference/logLik.mkinfit.html
@@ -41,7 +41,9 @@ For the case of unweighted least squares fitting, we calculate one
constant standard deviation from the residuals using sd
and add one to the number of fitted degradation model parameters.
For the case of manual weighting, we use the weight given for each
- observation as standard deviation in calculating its likelihood.
+ observation as standard deviation in calculating its likelihood
+ and the total number of estimated parameters is equal to the
+ number of fitted degradation model parameters.
In the case of iterative reweighting, the variances obtained by this
procedure are used in the likelihood calculations, and the number of
estimated parameters is obtained by the number of degradation model
@@ -147,7 +149,9 @@ In the case of iterative reweighting, the variances obtained by this
constant standard deviation from the residuals using
sd
and add one to the number of fitted degradation model parameters.
For the case of manual weighting, we use the weight given for each - observation as standard deviation in calculating its likelihood.
+ observation as standard deviation in calculating its likelihood + and the total number of estimated parameters is equal to the + number of fitted degradation model parameters.In the case of iterative reweighting, the variances obtained by this procedure are used in the likelihood calculations, and the number of estimated parameters is obtained by the number of degradation model diff --git a/docs/reference/mccall81_245T.html b/docs/reference/mccall81_245T.html index 2cd933e9..981c633a 100644 --- a/docs/reference/mccall81_245T.html +++ b/docs/reference/mccall81_245T.html @@ -158,8 +158,8 @@ anisole = list(type = "SFO"))
#> mkin version used for fitting: 0.9.47.6 #> R version used for fitting: 3.5.1 -#> Date of fit: Mon Nov 26 09:29:14 2018 -#> Date of summary: Mon Nov 26 09:29:14 2018 +#> Date of fit: Mon Nov 26 09:47:09 2018 +#> Date of summary: Mon Nov 26 09:47:09 2018 #> #> Equations: #> d_parent/dt = - k_parent_sink * parent diff --git a/docs/reference/transform_odeparms.html b/docs/reference/transform_odeparms.html index 24b50890..c0ff16fd 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: Mon Nov 26 09:29:22 2018 -#> Date of summary: Mon Nov 26 09:29:22 2018 +#> Date of fit: Mon Nov 26 09:47:17 2018 +#> Date of summary: Mon Nov 26 09:47:17 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.683 s +#> Fitted with method Port using 153 model solutions performed in 0.673 s #> #> Weighting: none #> @@ -276,8 +276,8 @@ The transformation of sets of formation fractions is fragile, as it supposesfit.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: Mon Nov 26 09:29:24 2018 -#> Date of summary: Mon Nov 26 09:29:24 2018 +#> Date of fit: Mon Nov 26 09:47:18 2018 +#> Date of summary: Mon Nov 26 09:47:18 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.594 s +#> Fitted with method Port using 350 model solutions performed in 1.529 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: Mon Nov 26 09:29:25 2018 -#> Date of summary: Mon Nov 26 09:29:25 2018 +#> Date of fit: Mon Nov 26 09:47:20 2018 +#> Date of summary: Mon Nov 26 09:47:20 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.819 s +#> Fitted with method Port using 186 model solutions performed in 0.847 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: Mon Nov 26 09:29:26 2018 -#> Date of summary: Mon Nov 26 09:29:26 2018 +#> Date of fit: Mon Nov 26 09:47:20 2018 +#> Date of summary: Mon Nov 26 09:47:20 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.486 s +#> Fitted with method Port using 104 model solutions performed in 0.457 s #> #> Weighting: none #> -- cgit v1.2.1