Merge branch 'main' into custom_lsoda_call

1 files changed, 26 insertions, 17 deletions

diff --git a/tests/testthat/summary_hfit_sfo_tc.txt b/tests/testthat/summary_hfit_sfo_tc.txt
index 41743091..0618c715 100644
--- a/tests/testthat/summary_hfit_sfo_tc.txt
+++ b/tests/testthat/summary_hfit_sfo_tc.txt
@@ -8,7 +8,7 @@ Equations:
 d_parent/dt = - k_parent * parent
 
 Data:
-106 observations of 1 variable(s) grouped in 6 datasets
+95 observations of 1 variable(s) grouped in 6 datasets
 
 Model predictions using solution type analytical 
 
@@ -17,26 +17,35 @@ Using 300, 100 iterations and 9 chains
 
 Variance model: Two-component variance function 
 
-Mean of starting values for individual parameters:
+Starting values for degradation parameters:
     parent_0 log_k_parent 
-         101           -3 
+          94           -2 
 
 Fixed degradation parameter values:
 None
 
+Starting values for random effects (square root of initial entries in omega):
+             parent_0 log_k_parent
+parent_0            4          0.0
+log_k_parent        0          0.7
+
+Starting values for error model parameters:
+a.1 b.1 
+  1   1 
+
 Results:
 
 Likelihood computed by importance sampling
   AIC BIC logLik
-  533 531   -261
+  542 541   -266
 
 Optimised parameters:
-                  est.  lower  upper
-parent_0        101.02  99.58 102.46
-log_k_parent     -3.32  -3.53  -3.11
-a.1               0.91   0.64   1.17
-b.1               0.05   0.04   0.06
-SD.log_k_parent   0.27   0.11   0.42
+                 est. lower upper
+parent_0        92.52 89.11  95.9
+log_k_parent    -1.66 -2.07  -1.3
+a.1              2.03  1.60   2.5
+b.1              0.09  0.07   0.1
+SD.log_k_parent  0.51  0.22   0.8
 
 Correlation: 
              pr_0
@@ -44,18 +53,18 @@ log_k_parent 0.1
 
 Random effects:
                 est. lower upper
-SD.log_k_parent  0.3   0.1   0.4
+SD.log_k_parent  0.5   0.2   0.8
 
 Variance model:
     est. lower upper
-a.1 0.91  0.64  1.17
-b.1 0.05  0.04  0.06
+a.1 2.03  1.60   2.5
+b.1 0.09  0.07   0.1
 
 Backtransformed parameters:
-          est. lower upper
-parent_0 1e+02 1e+02 1e+02
-k_parent 4e-02 3e-02 4e-02
+         est. lower upper
+parent_0 92.5  89.1  95.9
+k_parent  0.2   0.1   0.3
 
 Estimated disappearance times:
        DT50 DT90
-parent   19   64
+parent    4   12