Merge branch 'nlmixr'

1 files changed, 23 insertions, 23 deletions

diff --git a/tests/testthat/summary_nlme_biphasic_s.txt b/tests/testthat/summary_nlme_biphasic_s.txt
index 65aead62..86049775 100644
--- a/tests/testthat/summary_nlme_biphasic_s.txt
+++ b/tests/testthat/summary_nlme_biphasic_s.txt
@@ -13,19 +13,19 @@ d_m1/dt = + f_parent_to_m1 * ((k1 * g * exp(-k1 * time) + k2 * (1 - g)
            exp(-k2 * time))) * parent - k_m1 * m1
 
 Data:
-509 observations of 2 variable(s) grouped in 15 datasets
+507 observations of 2 variable(s) grouped in 15 datasets
 
 Model predictions using solution type analytical 
 
-Fitted in test time 0 s using 3 iterations
+Fitted in test time 0 s using 4 iterations
 
 Variance model: Constant variance 
 
 Mean of starting values for individual parameters:
        parent_0        log_k_m1 f_parent_qlogis          log_k1          log_k2 
-         100.70           -5.35           -0.08           -2.68           -4.37 
+         100.67           -5.38           -0.09           -2.74           -4.51 
        g_qlogis 
-          -0.33 
+          -0.18 
 
 Fixed degradation parameter values:
      value  type
@@ -34,40 +34,40 @@ m1_0     0 state
 Results:
 
    AIC  BIC logLik
-  2683 2738  -1329
+  2678 2733  -1326
 
 Optimised, transformed parameters with symmetric confidence intervals:
-                lower   est.  upper
-parent_0         99.6 100.43 101.26
-log_k_m1         -5.5  -5.34  -5.18
-f_parent_qlogis  -0.3  -0.08   0.09
-log_k1           -3.2  -2.90  -2.60
-log_k2           -4.6  -4.34  -4.07
-g_qlogis         -0.5  -0.19   0.08
+                lower  est.  upper
+parent_0         99.8 100.7 101.62
+log_k_m1         -5.6  -5.4  -5.25
+f_parent_qlogis  -0.3  -0.1   0.06
+log_k1           -3.0  -2.8  -2.57
+log_k2           -4.7  -4.5  -4.35
+g_qlogis         -0.4  -0.1   0.17
 
 Correlation: 
                 prnt_0 lg_k_1 f_prn_ log_k1 log_k2
-log_k_m1        -0.177                            
-f_parent_qlogis -0.164  0.385                     
-log_k1           0.108 -0.017 -0.025              
-log_k2           0.036  0.054  0.008  0.096       
-g_qlogis        -0.068 -0.110 -0.030 -0.269 -0.267
+log_k_m1        -0.167                            
+f_parent_qlogis -0.145  0.380                     
+log_k1           0.170  0.005 -0.026              
+log_k2           0.083  0.168  0.032  0.365       
+g_qlogis        -0.088 -0.170 -0.044 -0.472 -0.631
 
 Random effects:
  Formula: list(parent_0 ~ 1, log_k_m1 ~ 1, f_parent_qlogis ~ 1, log_k1 ~ 1,      log_k2 ~ 1, g_qlogis ~ 1)
  Level: ds
  Structure: Diagonal
         parent_0 log_k_m1 f_parent_qlogis log_k1 log_k2 g_qlogis Residual
-StdDev:        1      0.1             0.3    0.6    0.5      0.3        3
+StdDev:        1     0.03             0.3    0.3    0.2      0.3        3
 
 
 Backtransformed parameters with asymmetric confidence intervals:
                lower  est. upper
 parent_0       1e+02 1e+02 1e+02
-k_m1           4e-03 5e-03 6e-03
+k_m1           4e-03 4e-03 5e-03
 f_parent_to_m1 4e-01 5e-01 5e-01
-k1             4e-02 6e-02 7e-02
-k2             1e-02 1e-02 2e-02
+k1             5e-02 6e-02 8e-02
+k2             9e-03 1e-02 1e-02
 g              4e-01 5e-01 5e-01
 
 Resulting formation fractions:
@@ -77,5 +77,5 @@ parent_sink 0.5
 
 Estimated disappearance times:
        DT50 DT90 DT50back DT50_k1 DT50_k2
-parent   26  131       39      13      53
-m1      144  479       NA      NA      NA
+parent   25  150       45      11      63
+m1      154  512       NA      NA      NA