#> dataset
#> model B
-#> SFO List,41
+#> SFO List,39
#> attr(,"class")
#> [1] "mmkin"
head(
@@ -206,23 +214,17 @@ either a list of mkinfit objects or a single mkinfit object.
#>
#> $evaluations
#> function gradient
-#> 25 72
+#> 25 78
#>
#> $message
#> [1] "both X-convergence and relative convergence (5)"
#>
diff --git a/docs/reference/FOCUS_2006_DFOP_ref_A_to_B.html b/docs/reference/FOCUS_2006_DFOP_ref_A_to_B.html
index 83d624bb..b2292604 100644
--- a/docs/reference/FOCUS_2006_DFOP_ref_A_to_B.html
+++ b/docs/reference/FOCUS_2006_DFOP_ref_A_to_B.html
@@ -10,23 +10,27 @@
-
+
-
+
-
+
+
+
+
+
-
-
+
+
-
+
-
-
+
+
@@ -41,7 +45,6 @@ generated with different software packages. Taken directly from FOCUS (2006).
The results from fitting the data with the Topfit software was removed, as
the initial concentration of the parent compound was fixed to a value of 100
in this fit." />
-
@@ -59,7 +62,7 @@ in this fit." />
-
+
@@ -73,7 +76,7 @@ in this fit." />
mkin
- 0.9.49.6
+ 0.9.50.2
diff --git a/docs/reference/FOCUS_2006_FOMC_ref_A_to_F.html b/docs/reference/FOCUS_2006_FOMC_ref_A_to_F.html
index 75a0da96..71cfb721 100644
--- a/docs/reference/FOCUS_2006_FOMC_ref_A_to_F.html
+++ b/docs/reference/FOCUS_2006_FOMC_ref_A_to_F.html
@@ -10,23 +10,27 @@
-
+
-
+
-
+
+
+
+
+
-
-
+
+
-
+
-
-
+
+
@@ -41,7 +45,6 @@ generated with different software packages. Taken directly from FOCUS (2006).
The results from fitting the data with the Topfit software was removed, as
the initial concentration of the parent compound was fixed to a value of 100
in this fit." />
-
@@ -59,7 +62,7 @@ in this fit." />
-
+
@@ -73,7 +76,7 @@ in this fit." />
mkin
- 0.9.49.6
+ 0.9.50.2
diff --git a/docs/reference/FOCUS_2006_HS_ref_A_to_F.html b/docs/reference/FOCUS_2006_HS_ref_A_to_F.html
index d9d24bdf..21d778a8 100644
--- a/docs/reference/FOCUS_2006_HS_ref_A_to_F.html
+++ b/docs/reference/FOCUS_2006_HS_ref_A_to_F.html
@@ -10,23 +10,27 @@
-
+
-
+
-
+
+
+
+
+
-
-
+
+
-
+
-
-
+
+
@@ -41,7 +45,6 @@ generated with different software packages. Taken directly from FOCUS (2006).
The results from fitting the data with the Topfit software was removed, as
the initial concentration of the parent compound was fixed to a value of 100
in this fit." />
-
@@ -59,7 +62,7 @@ in this fit." />
-
+
@@ -73,7 +76,7 @@ in this fit." />
mkin
- 0.9.49.6
+ 0.9.50.2
diff --git a/docs/reference/FOCUS_2006_SFO_ref_A_to_F.html b/docs/reference/FOCUS_2006_SFO_ref_A_to_F.html
index 8c0f5bc9..8d5a0c59 100644
--- a/docs/reference/FOCUS_2006_SFO_ref_A_to_F.html
+++ b/docs/reference/FOCUS_2006_SFO_ref_A_to_F.html
@@ -10,23 +10,27 @@
-
+
-
+
-
+
+
+
+
+
-
-
+
+
-
+
-
-
+
+
@@ -41,7 +45,6 @@ generated with different software packages. Taken directly from FOCUS (2006).
The results from fitting the data with the Topfit software was removed, as
the initial concentration of the parent compound was fixed to a value of 100
in this fit." />
-
@@ -59,7 +62,7 @@ in this fit." />
-
+
@@ -73,7 +76,7 @@ in this fit." />
mkin
- 0.9.49.6
+ 0.9.50.2
# Using more cores does not save much time here, as parent_0 takes up most of the time
+#> 3.410 0.000 3.412
# Using more cores does not save much time here, as parent_0 takes up most of the time# If we additionally exclude parent_0 (the confidence of which is often of# minor interest), we get a nice performance improvement from about 50# seconds to about 12 seconds if we use at least four coressystem.time(ci_profile_no_parent_0<-confint(f_d_1, method="profile",
- c("k_parent_sink", "k_parent_m1", "k_m1_sink", "sigma"), cores=n_cores))
#> Profiling the likelihood
#> Warning: scheduled cores 1, 2, 3 encountered errors in user code, all values of the jobs will be affected
#> Error in dimnames(x) <- dn: Länge von 'dimnames' [2] ungleich der Arrayausdehnung
@@ -198,7 +206,7 @@ Dataset 12 is from the Renewal Assessment Report (RAR) for thifensulfuron-methyl
Format
A list containing twelve datasets as an R6 class defined by mkinds,
- each containing, among others, the following components
+ each containing, among others, the following components
title
The name of the dataset, e.g. Soil 1
data
A data frame with the data in the form expected by mkinfit
@@ -257,17 +265,13 @@ Dataset 12 is from the Renewal Assessment Report (RAR) for thifensulfuron-methyl
f_1_2_tc<-mmkin(list("DFOP-SFO-SFO"=dfop_sfo_sfo), d_1_2, error_model="tc")
-plot(f_1_2_tc, resplot="errmod")
diff --git a/docs/reference/logLik.mkinfit.html b/docs/reference/logLik.mkinfit.html
index 8e33c28f..22561d8a 100644
--- a/docs/reference/logLik.mkinfit.html
+++ b/docs/reference/logLik.mkinfit.html
@@ -76,7 +76,7 @@ the error model." />
mkin
- 0.9.50.1
+ 0.9.50.2
diff --git a/docs/reference/lrtest.mkinfit.html b/docs/reference/lrtest.mkinfit.html
index 6861b747..433b0a8b 100644
--- a/docs/reference/lrtest.mkinfit.html
+++ b/docs/reference/lrtest.mkinfit.html
@@ -10,23 +10,27 @@
-
+
-
+
-
+
+
+
+
+
-
-
+
+
-
+
-
-
+
+
@@ -41,7 +45,6 @@ mkinfit objects are given as arguments, it is checked if they have been
fitted to the same data. It is the responsibility of the user to make sure
that the models are nested, i.e. one of them has less degrees of freedom
and can be expressed by fixing the parameters of the other." />
-
@@ -59,7 +62,7 @@ and can be expressed by fixing the parameters of the other." />
-
+
@@ -73,7 +76,7 @@ and can be expressed by fixing the parameters of the other." />
mkin
- 0.9.49.9
+ 0.9.50.2
@@ -117,7 +120,12 @@ and can be expressed by fixing the parameters of the other." />
#> mkin version used for fitting: 0.9.50.2
#> R version used for fitting: 4.0.0
-#> Date of fit: Tue May 12 10:55:39 2020
-#> Date of summary: Tue May 12 10:55:39 2020
+#> Date of fit: Tue May 12 15:29:48 2020
+#> Date of summary: Tue May 12 15:29:48 2020
#>
#> Equations:
#> d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
@@ -507,7 +507,7 @@ Degradation Data. Environments 6(12) 124
m1=mkinsub("SFO"))
#> Successfully compiled differential equation model from auto-generated C code.
# Fit the model to the FOCUS example dataset D using defaultsprint(system.time(fit<-mkinfit(SFO_SFO, FOCUS_2006_D,
solution_type="eigen", quiet=TRUE)))
#> Warning: Observations with value of zero were removed from the data
#> mkin version used for fitting: 0.9.50.2
#> R version used for fitting: 4.0.0
-#> Date of fit: Tue May 12 10:55:44 2020
-#> Date of summary: Tue May 12 10:55:44 2020
+#> Date of fit: Tue May 12 15:29:53 2020
+#> Date of summary: Tue May 12 15:29:53 2020
#>
#> Equations:
#> d_parent/dt = - k_parent * parent
@@ -640,7 +640,7 @@ Degradation Data. Environments 6(12) 124
#>
#> Model predictions using solution type analytical
#>
-#> Fitted using 421 model solutions performed in 0.147 s
+#> Fitted using 421 model solutions performed in 0.13 s
#>
#> Error model: Constant variance
#>
@@ -753,8 +753,8 @@ Degradation Data. Environments 6(12) 124
#> 120 m1 25.15 28.78984 -3.640e+00
#> 120 m1 33.31 28.78984 4.520e+00
#> mkin version used for fitting: 0.9.50.2
#> R version used for fitting: 4.0.0
-#> Date of fit: Tue May 12 10:55:44 2020
-#> Date of summary: Tue May 12 10:55:44 2020
+#> Date of fit: Tue May 12 15:29:53 2020
+#> Date of summary: Tue May 12 15:29:53 2020
#>
#> Equations:
#> d_parent/dt = - k_parent * parent
@@ -762,7 +762,7 @@ Degradation Data. Environments 6(12) 124
#>
#> Model predictions using solution type analytical
#>
-#> Fitted using 978 model solutions performed in 0.334 s
+#> Fitted using 978 model solutions performed in 0.337 s
#>
#> Error model: Variance unique to each observed variable
#>
@@ -890,8 +890,8 @@ Degradation Data. Environments 6(12) 124
#> 120 m1 25.15 28.80429 -3.654e+00
#> 120 m1 33.31 28.80429 4.506e+00
#> mkin version used for fitting: 0.9.50.2
#> R version used for fitting: 4.0.0
-#> Date of fit: Tue May 12 10:55:45 2020
-#> Date of summary: Tue May 12 10:55:45 2020
+#> Date of fit: Tue May 12 15:29:54 2020
+#> Date of summary: Tue May 12 15:29:54 2020
#>
#> Equations:
#> d_parent/dt = - k_parent * parent
@@ -899,7 +899,7 @@ Degradation Data. Environments 6(12) 124
#>
#> Model predictions using solution type analytical
#>
-#> Fitted using 1875 model solutions performed in 0.643 s
+#> Fitted using 1875 model solutions performed in 0.645 s
#>
#> Error model: Two-component variance function
#>
diff --git a/docs/reference/mkinmod.html b/docs/reference/mkinmod.html
index 1c97048e..79b21d33 100644
--- a/docs/reference/mkinmod.html
+++ b/docs/reference/mkinmod.html
@@ -75,7 +75,7 @@ list of lists can be given in the speclist argument." />
mkin
- 0.9.50.1
+ 0.9.50.2
@@ -255,7 +255,7 @@ Evaluating and Calculating Degradation Kinetics in Environmental Media
SFO_SFO<-mkinmod(
parent=mkinsub("SFO", "m1"),
m1=mkinsub("SFO"), verbose=TRUE)
#> $ff
#> parent_M1 parent_sink M1_M2 M1_sink
#> 0.7340478 0.2659522 0.7505691 0.2494309
diff --git a/docs/reference/nafta.html b/docs/reference/nafta.html
index 02c44737..34cce546 100644
--- a/docs/reference/nafta.html
+++ b/docs/reference/nafta.html
@@ -76,7 +76,7 @@ order of increasing model complexity, i.e. SFO, then IORE, and finally DFOP." />
mkin
- 0.9.50.1
+ 0.9.50.2
diff --git a/docs/reference/nlme.html b/docs/reference/nlme.html
index 78489ee7..8ef7e7c9 100644
--- a/docs/reference/nlme.html
+++ b/docs/reference/nlme.html
@@ -75,7 +75,7 @@ datasets." />
mkin
- 0.9.50.1
+ 0.9.50.2
diff --git a/docs/reference/nlme.mmkin.html b/docs/reference/nlme.mmkin.html
index 4e5a86cb..928ee378 100644
--- a/docs/reference/nlme.mmkin.html
+++ b/docs/reference/nlme.mmkin.html
@@ -74,7 +74,7 @@ have been obtained by fitting the same model to a list of datasets." />
mkin
- 0.9.50.1
+ 0.9.50.2
@@ -181,7 +181,7 @@ have been obtained by fitting the same model to a list of datasets.
#> mkin version used for fitting: 0.9.50.1
+ summary(mkinfit(mkinmod(parent=mkinsub("SFO")), FOCUS_2006_A, quiet=TRUE))
#> mkin version used for fitting: 0.9.50.2
#> R version used for fitting: 4.0.0
-#> Date of fit: Tue May 12 08:07:03 2020
-#> Date of summary: Tue May 12 08:07:03 2020
+#> Date of fit: Tue May 12 15:31:20 2020
+#> Date of summary: Tue May 12 15:31:20 2020
#>
#> Equations:
#> d_parent/dt = - k_parent * parent
#>
#> Model predictions using solution type analytical
#>
-#> Fitted using 131 model solutions performed in 0.026 s
+#> Fitted using 131 model solutions performed in 0.027 s
#>
#> Error model: Constant variance
#>
diff --git a/docs/reference/synthetic_data_for_UBA_2014-1.png b/docs/reference/synthetic_data_for_UBA_2014-1.png
index 201ef0fd..02976ced 100644
Binary files a/docs/reference/synthetic_data_for_UBA_2014-1.png and b/docs/reference/synthetic_data_for_UBA_2014-1.png differ
diff --git a/docs/reference/synthetic_data_for_UBA_2014.html b/docs/reference/synthetic_data_for_UBA_2014.html
index 6ac7403a..17d2f973 100644
--- a/docs/reference/synthetic_data_for_UBA_2014.html
+++ b/docs/reference/synthetic_data_for_UBA_2014.html
@@ -10,23 +10,27 @@
-
+
-
+
-
+
+
+
+
+
-
-
+
+
-
+
-
-
+
+
@@ -52,7 +56,6 @@ Initial concentrations for metabolites and all values where adding the variance
As an example, the first dataset has the title SFO_lin_a and is based on the SFO model
with two sequential metabolites (linear pathway), with added variance component 'a'.
Compare also the code in the example section to see the degradation models." />
-
@@ -70,7 +73,7 @@ Compare also the code in the example section to see the degradation models." />
-
+
@@ -84,7 +87,7 @@ Compare also the code in the example section to see the degradation models." />
mkin
- 0.9.49.6
+ 0.9.50.2
@@ -128,7 +131,12 @@ Compare also the code in the example section to see the degradation models." />
@@ -172,7 +180,7 @@ Compare also the code in the example section to see the degradation models." />
Format
A list containing twelve datasets as an R6 class defined by mkinds,
- each containing, among others, the following components
+ each containing, among others, the following components
title
The name of the dataset, e.g. SFO_lin_a
data
A data frame with the data in the form expected by mkinfit
@@ -280,10 +288,10 @@ Compare also the code in the example section to see the degradation models." />
# the generation of the datafit<-mkinfit(m_synth_SFO_lin, synthetic_data_for_UBA_2014[[1]]$data,
quiet=TRUE)
- plot_sep(fit)
#> mkin version used for fitting: 0.9.49.6
-#> R version used for fitting: 3.6.1
-#> Date of fit: Fri Nov 1 10:10:17 2019
-#> Date of summary: Fri Nov 1 10:10:17 2019
+ plot_sep(fit)
#> Warning: Could not calculate correlation; no covariance matrix
#> Estimate se_notrans t value Pr(>t) Lower Upper
+#> parent_w_0 95.91998116 NA NA NA NA NA
+#> k_parent_w 0.41145375 NA NA NA NA NA
+#> k_parent_s 0.04663944 NA NA NA NA NA
+#> f_parent_w_to_parent_s 0.12467894 NA NA NA NA NA
+#> f_parent_s_to_parent_w 0.50000000 NA NA NA NA NA
+#> sigma 3.13612618 NA NA NA NA NA
#> err.min n.optim df
+#> All data 0.1090929 5 6
+#> parent_w 0.0817436 3 3
+#> parent_s 0.1619965 2 3
# This is the evaluation used for the validation of software packages# in the expertise from 2014m_soil<-mkinmod(parent=mkinsub("SFO", c("M1", "M2")),
@@ -190,42 +191,38 @@
M3=mkinsub("SFO"),
use_of_ff="max")
#> Successfully compiled differential equation model from auto-generated C code.
diff --git a/docs/reference/transform_odeparms.html b/docs/reference/transform_odeparms.html
index 185a8a64..61ed96d7 100644
--- a/docs/reference/transform_odeparms.html
+++ b/docs/reference/transform_odeparms.html
@@ -245,7 +245,7 @@ This is no problem for the internal use in mkinfit<
#> sigma 3.12550 0.35852 8.72 2.24e-10 2.39609 3.8549