Improve tests

- Reduce significant digits for the objective function output in
mkinfit(..., quiet = FALSE) as R and R-devel gave different output on my
system
- Add makefile target 'devtest' for testing with R-devel, in order
to fix problems showing up with R-devel on Travis

1 files changed, 44 insertions, 44 deletions

diff --git a/tests/testthat/DFOP_FOCUS_C_messages.txt b/tests/testthat/DFOP_FOCUS_C_messages.txt
index 6aa73e01..b5a83146 100644
--- a/tests/testthat/DFOP_FOCUS_C_messages.txt
+++ b/tests/testthat/DFOP_FOCUS_C_messages.txt
@@ -3,146 +3,146 @@ parent_0   log_k1     log_k2     g_ilr
 Sum of squared residuals at call 1: 7391.39
   85.10000   -2.30259   -4.60517    0.00000 
   85.10000   -2.30259   -4.60517    0.00000 
-Sum of squared residuals at call 3: 7391.389
+Sum of squared residuals at call 3: 7391.39
   85.10000   -2.30259   -4.60517    0.00000 
-Sum of squared residuals at call 4: 7391.389
+Sum of squared residuals at call 4: 7391.39
  8.51000e+01 -2.30259e+00 -4.60517e+00  1.49012e-08 
  85.063710  -1.773280  -4.250366   0.769827 
-Sum of squared residuals at call 6: 2000.127
+Sum of squared residuals at call 6: 2000.13
  85.063752  -1.773280  -4.250366   0.769827 
  85.063710  -1.773322  -4.250366   0.769827 
  85.063710  -1.773280  -4.250408   0.769827 
  85.063710  -1.773280  -4.250366   0.769785 
  85.035419  -0.960852  -4.115460   1.336361 
-Sum of squared residuals at call 11: 32.97798
+Sum of squared residuals at call 11: 32.978
  85.035421  -0.960852  -4.115460   1.336361 
  85.035419  -0.960853  -4.115460   1.336361 
  85.035419  -0.960852  -4.115460   1.336361 
  85.035419  -0.960852  -4.115460   1.336361 
  85.037040  -0.256064  -4.273512   0.644775 
  85.032855  -0.782283  -4.127513   1.312494 
-Sum of squared residuals at call 17: 5.348133
+Sum of squared residuals at call 17: 5.34813
  85.032856  -0.782283  -4.127513   1.312494 
-Sum of squared residuals at call 18: 5.348132
+Sum of squared residuals at call 18: 5.34813
  85.032855  -0.782283  -4.127513   1.312494 
-Sum of squared residuals at call 19: 5.348131
+Sum of squared residuals at call 19: 5.34813
  85.032855  -0.782283  -4.127513   1.312494 
  85.032855  -0.782283  -4.127513   1.312494 
-Sum of squared residuals at call 21: 5.348131
+Sum of squared residuals at call 21: 5.34813
   85.02325   -0.74968   -4.05900    1.14891 
  85.031268  -0.790907  -4.114802   1.268157 
-Sum of squared residuals at call 23: 4.704445
+Sum of squared residuals at call 23: 4.70444
  85.031266  -0.790907  -4.114802   1.268157 
-Sum of squared residuals at call 24: 4.704444
+Sum of squared residuals at call 24: 4.70444
  85.031268  -0.790907  -4.114802   1.268157 
  85.031268  -0.790907  -4.114800   1.268157 
-Sum of squared residuals at call 26: 4.704433
+Sum of squared residuals at call 26: 4.70443
  85.031268  -0.790907  -4.114802   1.268158 
  85.030010  -0.780151  -4.069435   1.262797 
-Sum of squared residuals at call 28: 4.421625
+Sum of squared residuals at call 28: 4.42162
  85.030012  -0.780151  -4.069435   1.262797 
  85.030010  -0.780151  -4.069435   1.262797 
-Sum of squared residuals at call 30: 4.421624
+Sum of squared residuals at call 30: 4.42162
  85.030010  -0.780151  -4.069435   1.262797 
  85.030010  -0.780151  -4.069435   1.262797 
  85.028777  -0.790084  -4.023945   1.256918 
  85.029639  -0.785735  -4.054587   1.260236 
-Sum of squared residuals at call 34: 4.414346
+Sum of squared residuals at call 34: 4.41435
  85.029641  -0.785735  -4.054587   1.260236 
  85.029639  -0.785735  -4.054587   1.260236 
-Sum of squared residuals at call 36: 4.414346
+Sum of squared residuals at call 36: 4.41435
  85.029639  -0.785735  -4.054588   1.260236 
  85.029639  -0.785735  -4.054587   1.260236 
  85.028119  -0.777813  -4.042219   1.253890 
-Sum of squared residuals at call 39: 4.372463
+Sum of squared residuals at call 39: 4.37246
  85.028121  -0.777813  -4.042219   1.253890 
  85.028119  -0.777813  -4.042219   1.253890 
-Sum of squared residuals at call 41: 4.372462
+Sum of squared residuals at call 41: 4.37246
  85.028119  -0.777813  -4.042219   1.253890 
  85.028119  -0.777813  -4.042219   1.253890 
  85.024185  -0.776514  -4.029420   1.245094 
  85.026297  -0.777842  -4.036021   1.249634 
-Sum of squared residuals at call 45: 4.369313
+Sum of squared residuals at call 45: 4.36931
  85.026298  -0.777842  -4.036021   1.249634 
  85.026297  -0.777842  -4.036021   1.249634 
-Sum of squared residuals at call 47: 4.369313
+Sum of squared residuals at call 47: 4.36931
  85.026297  -0.777842  -4.036022   1.249634 
  85.026297  -0.777842  -4.036021   1.249634 
-Sum of squared residuals at call 49: 4.369313
+Sum of squared residuals at call 49: 4.36931
  85.022674  -0.778681  -4.029670   1.252015 
-Sum of squared residuals at call 50: 4.365062
+Sum of squared residuals at call 50: 4.36506
  85.022676  -0.778681  -4.029670   1.252015 
  85.022674  -0.778681  -4.029670   1.252015 
  85.022674  -0.778681  -4.029670   1.252015 
-Sum of squared residuals at call 53: 4.365062
+Sum of squared residuals at call 53: 4.36506
  85.022674  -0.778681  -4.029670   1.252015 
  85.016327  -0.776316  -4.027611   1.248897 
-Sum of squared residuals at call 55: 4.364078
+Sum of squared residuals at call 55: 4.36408
  85.016328  -0.776316  -4.027611   1.248897 
-Sum of squared residuals at call 56: 4.364078
+Sum of squared residuals at call 56: 4.36408
  85.016327  -0.776316  -4.027611   1.248897 
-Sum of squared residuals at call 57: 4.364077
+Sum of squared residuals at call 57: 4.36408
  85.016327  -0.776316  -4.027611   1.248897 
  85.016327  -0.776316  -4.027611   1.248897 
  85.008939  -0.777792  -4.026307   1.247720 
-Sum of squared residuals at call 60: 4.364052
+Sum of squared residuals at call 60: 4.36405
  85.008938  -0.777792  -4.026307   1.247720 
-Sum of squared residuals at call 61: 4.364052
+Sum of squared residuals at call 61: 4.36405
  85.008939  -0.777792  -4.026307   1.247720 
-Sum of squared residuals at call 62: 4.364052
+Sum of squared residuals at call 62: 4.36405
  85.008939  -0.777792  -4.026307   1.247720 
  85.008939  -0.777792  -4.026307   1.247720 
-Sum of squared residuals at call 64: 4.364052
+Sum of squared residuals at call 64: 4.36405
  85.005185  -0.777308  -4.026004   1.248453 
-Sum of squared residuals at call 65: 4.362751
+Sum of squared residuals at call 65: 4.36275
  85.005186  -0.777308  -4.026004   1.248453 
  85.005185  -0.777308  -4.026004   1.248453 
-Sum of squared residuals at call 67: 4.362751
+Sum of squared residuals at call 67: 4.36275
  85.005185  -0.777308  -4.026005   1.248453 
  85.005185  -0.777308  -4.026004   1.248453 
  85.001344  -0.777605  -4.025878   1.248775 
-Sum of squared residuals at call 70: 4.362721
+Sum of squared residuals at call 70: 4.36272
  85.001345  -0.777605  -4.025878   1.248775 
-Sum of squared residuals at call 71: 4.362721
+Sum of squared residuals at call 71: 4.36272
  85.001344  -0.777605  -4.025878   1.248775 
-Sum of squared residuals at call 72: 4.362721
+Sum of squared residuals at call 72: 4.36272
  85.001344  -0.777605  -4.025878   1.248775 
  85.001344  -0.777605  -4.025878   1.248775 
  85.003200  -0.777473  -4.025700   1.248643 
-Sum of squared residuals at call 75: 4.362715
+Sum of squared residuals at call 75: 4.36271
  85.003201  -0.777473  -4.025700   1.248643 
  85.003200  -0.777473  -4.025700   1.248643 
-Sum of squared residuals at call 77: 4.362715
+Sum of squared residuals at call 77: 4.36271
  85.003200  -0.777473  -4.025700   1.248643 
  85.003200  -0.777473  -4.025700   1.248643 
  85.003200  -0.777473  -4.025700   1.248643 
  85.003200  -0.777473  -4.025700   1.248643 
  85.002495  -0.777491  -4.025911   1.248679 
-Sum of squared residuals at call 82: 4.362715
+Sum of squared residuals at call 82: 4.36271
  85.002496  -0.777491  -4.025911   1.248679 
-Sum of squared residuals at call 83: 4.362715
+Sum of squared residuals at call 83: 4.36271
  85.002494  -0.777491  -4.025911   1.248679 
   85.00249   -0.77749   -4.02591    1.24868 
  85.002495  -0.777491  -4.025911   1.248679 
-Sum of squared residuals at call 86: 4.362715
+Sum of squared residuals at call 86: 4.36271
  85.002495  -0.777491  -4.025911   1.248679 
  85.002495  -0.777491  -4.025911   1.248679 
  85.002495  -0.777491  -4.025911   1.248679 
  85.002495  -0.777491  -4.025911   1.248679 
  85.002737  -0.777492  -4.025821   1.248672 
-Sum of squared residuals at call 91: 4.362714
+Sum of squared residuals at call 91: 4.36271
  85.002739  -0.777492  -4.025821   1.248672 
  85.002736  -0.777492  -4.025821   1.248672 
-Sum of squared residuals at call 93: 4.362714
+Sum of squared residuals at call 93: 4.36271
  85.002737  -0.777492  -4.025821   1.248672 
-Sum of squared residuals at call 94: 4.362714
+Sum of squared residuals at call 94: 4.36271
  85.002737  -0.777492  -4.025821   1.248672 
  85.002737  -0.777492  -4.025821   1.248672 
  85.002737  -0.777492  -4.025821   1.248672 
  85.002737  -0.777492  -4.025821   1.248672 
  85.002737  -0.777492  -4.025821   1.248672 
  85.002731  -0.777491  -4.025817   1.248670 
-Sum of squared residuals at call 100: 4.362714
+Sum of squared residuals at call 100: 4.36271
  85.002752  -0.777491  -4.025817   1.248670 
  85.002710  -0.777491  -4.025817   1.248670 
   85.00273   -0.77749   -4.02582    1.24867 
@@ -152,7 +152,7 @@ Sum of squared residuals at call 100: 4.362714
  85.002731  -0.777491  -4.025817   1.248671 
  85.002731  -0.777491  -4.025817   1.248669 
  85.002737  -0.777491  -4.025819   1.248671 
-Sum of squared residuals at call 109: 4.362714
+Sum of squared residuals at call 109: 4.36271
  85.002758  -0.777491  -4.025819   1.248671 
  85.002716  -0.777491  -4.025819   1.248671 
   85.00274   -0.77749   -4.02582    1.24867