From 7624a2b8398b4ad665a3b0b622488e1893a5ee7c Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Mon, 21 Oct 2019 12:11:34 +0200 Subject: Refactor mkinfit, infrastructure work mkinfit objects now include an ll() function to calculate the log-likelihood. Part of the code was refactored, hopefully making it easier to read and maintain. IRLS is currently the default algorithm for the error model "obs", for no particular reason. This may be subject to change when I get around to investigate. Slow tests are now in a separate subdirectory and will probably only be run by my own Makefile target. Formatting of test logs is improved. Roundtripping error model parameters works with a precision of 10% when we use lots of replicates in the synthetic data (see slow tests). This is not new in this commit, but as I think it is reasonable this closes #7. --- tests/testthat/summary_DFOP_FOCUS_C.txt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'tests/testthat/summary_DFOP_FOCUS_C.txt') diff --git a/tests/testthat/summary_DFOP_FOCUS_C.txt b/tests/testthat/summary_DFOP_FOCUS_C.txt index b1afeff6..90ce82e2 100644 --- a/tests/testthat/summary_DFOP_FOCUS_C.txt +++ b/tests/testthat/summary_DFOP_FOCUS_C.txt @@ -17,12 +17,11 @@ Error model: Constant variance Error model algorithm: OLS Starting values for parameters to be optimised: - value type -parent_0 85.100000 state -k1 0.100000 deparm -k2 0.010000 deparm -g 0.500000 deparm -sigma 0.696237 error + value type +parent_0 85.10 state +k1 0.10 deparm +k2 0.01 deparm +g 0.50 deparm Starting values for the transformed parameters actually optimised: value lower upper @@ -30,7 +29,6 @@ parent_0 85.100000 -Inf Inf log_k1 -2.302585 -Inf Inf log_k2 -4.605170 -Inf Inf g_ilr 0.000000 -Inf Inf -sigma 0.696237 0 Inf Fixed parameter values: None -- cgit v1.2.1