From 95178837d3f91e84837628446b5fd468179af2b9 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Tue, 4 Jun 2019 15:09:28 +0200 Subject: Additional algorithm "d_c", more tests, docs The new algorithm tries direct optimization of the likelihood, as well as a three step procedure. In this way, we consistently get the model with the highest likelihood for SFO, DFOP and HS for all 12 new test datasets. --- docs/reference/summary.mkinfit.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'docs/reference/summary.mkinfit.html') diff --git a/docs/reference/summary.mkinfit.html b/docs/reference/summary.mkinfit.html index b3151da1..ffe1edb1 100644 --- a/docs/reference/summary.mkinfit.html +++ b/docs/reference/summary.mkinfit.html @@ -66,7 +66,7 @@ mkin - 0.9.49.4 + 0.9.49.5 @@ -209,10 +209,10 @@

Examples

- 
  summary(mkinfit(mkinmod(parent = mkinsub("SFO")), FOCUS_2006_A, quiet = TRUE))
#> mkin version used for fitting:    0.9.49.4 
+    
  summary(mkinfit(mkinmod(parent = mkinsub("SFO")), FOCUS_2006_A, quiet = TRUE))
#> mkin version used for fitting:    0.9.49.5 
 #> R version used for fitting:       3.6.0 
-#> Date of fit:     Wed May  8 20:52:12 2019 
-#> Date of summary: Wed May  8 20:52:12 2019 
+#> Date of fit:     Tue Jun  4 15:03:02 2019 
+#> Date of summary: Tue Jun  4 15:03:02 2019 
 #> 
 #> Equations:
 #> d_parent/dt = - k_parent_sink * parent
@@ -307,7 +307,7 @@
 

 
 

-  
Site built with pkgdown 1.3.0.9000.

+  
Site built with pkgdown 1.3.0.

 

       
    

-- 
cgit v1.2.1


From b6027bbd157734e1c7f8c3ba6373451f5c85fc38 Mon Sep 17 00:00:00 2001
From: Johannes Ranke 
Date: Wed, 5 Jun 2019 15:16:59 +0200
Subject: Add error model algorithm to output

---
 docs/reference/summary.mkinfit.html | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'docs/reference/summary.mkinfit.html')

diff --git a/docs/reference/summary.mkinfit.html b/docs/reference/summary.mkinfit.html
index ffe1edb1..68b36542 100644
--- a/docs/reference/summary.mkinfit.html
+++ b/docs/reference/summary.mkinfit.html
@@ -211,18 +211,19 @@
     
Examples

     
  summary(mkinfit(mkinmod(parent = mkinsub("SFO")), FOCUS_2006_A, quiet = TRUE))
#> mkin version used for fitting:    0.9.49.5 
 #> R version used for fitting:       3.6.0 
-#> Date of fit:     Tue Jun  4 15:03:02 2019 
-#> Date of summary: Tue Jun  4 15:03:02 2019 
+#> Date of fit:     Wed Jun  5 15:10:34 2019 
+#> Date of summary: Wed Jun  5 15:10:34 2019 
 #> 
 #> Equations:
 #> d_parent/dt = - k_parent_sink * parent
 #> 
 #> Model predictions using solution type analytical 
 #> 
-#> Fitted using 131 model solutions performed in 0.266 s
+#> Fitted using 131 model solutions performed in 0.268 s
 #> 
-#> Error model:
-#> Constant variance 
+#> Error model: Constant variance 
+#> 
+#> Error model algorithm: d_3 
 #> 
 #> Starting values for parameters to be optimised:
 #>                    value   type
-- 
cgit v1.2.1