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. --- tests/testthat/FOCUS_2006_D.csf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/testthat/FOCUS_2006_D.csf') diff --git a/tests/testthat/FOCUS_2006_D.csf b/tests/testthat/FOCUS_2006_D.csf index da2e2fbe..43215ec4 100644 --- a/tests/testthat/FOCUS_2006_D.csf +++ b/tests/testthat/FOCUS_2006_D.csf @@ -5,7 +5,7 @@ Description: MeasurementUnits: % AR TimeUnits: days Comments: Created using mkin::CAKE_export -Date: 2019-05-08 +Date: 2019-06-04 Optimiser: IRLS [Data] -- cgit v1.2.1 From 4b323789265213bd65165873e7efe5e45a579275 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Wed, 5 Jun 2019 15:45:31 +0200 Subject: Adapt tests to new algorithms and output One of the tests exceeded the number of iterations when using the d_3 error model algorithm, so only use "direct" in this case. --- tests/testthat/FOCUS_2006_D.csf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/testthat/FOCUS_2006_D.csf') diff --git a/tests/testthat/FOCUS_2006_D.csf b/tests/testthat/FOCUS_2006_D.csf index 43215ec4..668b1151 100644 --- a/tests/testthat/FOCUS_2006_D.csf +++ b/tests/testthat/FOCUS_2006_D.csf @@ -5,7 +5,7 @@ Description: MeasurementUnits: % AR TimeUnits: days Comments: Created using mkin::CAKE_export -Date: 2019-06-04 +Date: 2019-06-05 Optimiser: IRLS [Data] -- cgit v1.2.1