aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--R/mkinfit.R4
-rw-r--r--tests/testthat/DFOP_FOCUS_C_messages.txt242
2 files changed, 123 insertions, 123 deletions
diff --git a/R/mkinfit.R b/R/mkinfit.R
index f6691b1b..9c3f2baa 100644
--- a/R/mkinfit.R
+++ b/R/mkinfit.R
@@ -532,7 +532,7 @@ mkinfit <- function(mkinmod, observed,
assign("calls", calls + 1, inherits = TRUE) # Increase the model solution counter
# Trace parameter values if requested and if we are actually optimising
- if(trace_parms & update_data) cat(P, "\n")
+ if(trace_parms & update_data) cat(format(P, width = 10, digits = 6), "\n")
# Determine local parameter values for the cost estimation
if (is.numeric(fixed_degparms)) {
@@ -688,7 +688,7 @@ mkinfit <- function(mkinmod, observed,
current_data <- NA
# Show parameter names if tracing is requested
- if(trace_parms) cat(names_optim, "\n")
+ if(trace_parms) cat(format(names_optim, width = 10), "\n")
#browser()
diff --git a/tests/testthat/DFOP_FOCUS_C_messages.txt b/tests/testthat/DFOP_FOCUS_C_messages.txt
index c36f11db..7284dd19 100644
--- a/tests/testthat/DFOP_FOCUS_C_messages.txt
+++ b/tests/testthat/DFOP_FOCUS_C_messages.txt
@@ -1,165 +1,165 @@
-parent_0 log_k1 log_k2 g_ilr
-85.1 -2.302585 -4.60517 0
+parent_0 log_k1 log_k2 g_ilr
+ 85.10000 -2.30259 -4.60517 0.00000
Sum of squared residuals at call 1: 7391.39
-85.1 -2.302585 -4.60517 0
-85.1 -2.302585 -4.60517 0
+ 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
-85.1 -2.302585 -4.60517 0
+ 85.10000 -2.30259 -4.60517 0.00000
Sum of squared residuals at call 4: 7391.389
-85.1 -2.302585 -4.60517 1.490116e-08
-85.06371 -1.77328 -4.250366 0.7698268
+ 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
-85.06375 -1.77328 -4.250366 0.7698268
-85.06371 -1.773322 -4.250366 0.7698268
-85.06371 -1.77328 -4.250408 0.7698268
-85.06371 -1.77328 -4.250366 0.7697847
-85.03542 -0.9608523 -4.11546 1.336361
+ 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
-85.03542 -0.9608523 -4.11546 1.336361
-85.03542 -0.9608526 -4.11546 1.336361
-85.03542 -0.9608523 -4.11546 1.336361
-85.03542 -0.9608523 -4.11546 1.336361
-85.03704 -0.256064 -4.273512 0.6447755
-85.03285 -0.7822828 -4.127513 1.312494
+ 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
-85.03286 -0.7822828 -4.127513 1.312494
+ 85.032856 -0.782283 -4.127513 1.312494
Sum of squared residuals at call 18: 5.348132
-85.03285 -0.7822828 -4.127513 1.312494
+ 85.032855 -0.782283 -4.127513 1.312494
Sum of squared residuals at call 19: 5.348131
-85.03285 -0.7822828 -4.127513 1.312494
-85.03285 -0.7822828 -4.127513 1.312494
+ 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
-85.02325 -0.74968 -4.059 1.14891
-85.03127 -0.7909068 -4.114802 1.268157
+ 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
-85.03127 -0.7909068 -4.114802 1.268157
+ 85.031266 -0.790907 -4.114802 1.268157
Sum of squared residuals at call 24: 4.704444
-85.03127 -0.7909068 -4.114802 1.268157
-85.03127 -0.7909068 -4.1148 1.268157
+ 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
-85.03127 -0.7909068 -4.114802 1.268158
-85.03001 -0.7801506 -4.069435 1.262797
+ 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
-85.03001 -0.7801506 -4.069435 1.262797
-85.03001 -0.7801507 -4.069435 1.262797
+ 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
-85.03001 -0.7801506 -4.069435 1.262797
-85.03001 -0.7801506 -4.069435 1.262797
-85.02878 -0.7900844 -4.023945 1.256918
-85.02964 -0.7857352 -4.054587 1.260236
+ 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
-85.02964 -0.7857352 -4.054587 1.260236
-85.02964 -0.7857351 -4.054587 1.260236
+ 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
-85.02964 -0.7857352 -4.054588 1.260236
-85.02964 -0.7857352 -4.054587 1.260236
-85.02812 -0.7778128 -4.042219 1.25389
+ 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
-85.02812 -0.7778128 -4.042219 1.25389
-85.02812 -0.7778129 -4.042219 1.25389
+ 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
-85.02812 -0.7778128 -4.042219 1.25389
-85.02812 -0.7778128 -4.042219 1.25389
-85.02419 -0.7765144 -4.02942 1.245094
-85.0263 -0.7778419 -4.036021 1.249634
+ 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
-85.0263 -0.7778419 -4.036021 1.249634
-85.0263 -0.7778418 -4.036021 1.249634
+ 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
-85.0263 -0.7778419 -4.036022 1.249634
-85.0263 -0.7778419 -4.036021 1.249634
+ 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
-85.02267 -0.7786811 -4.02967 1.252015
+ 85.022674 -0.778681 -4.029670 1.252015
Sum of squared residuals at call 50: 4.365062
-85.02268 -0.7786811 -4.02967 1.252015
-85.02267 -0.7786812 -4.02967 1.252015
-85.02267 -0.7786811 -4.02967 1.252015
+ 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
-85.02267 -0.7786811 -4.02967 1.252015
-85.01633 -0.7763163 -4.027611 1.248897
+ 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
-85.01633 -0.7763163 -4.027611 1.248897
+ 85.016328 -0.776316 -4.027611 1.248897
Sum of squared residuals at call 56: 4.364078
-85.01633 -0.7763164 -4.027611 1.248897
-Sum of squared residuals at call 57: 4.364077
-85.01633 -0.7763163 -4.027611 1.248897
-85.01633 -0.7763163 -4.027611 1.248897
-85.00894 -0.7777917 -4.026307 1.24772
+ 85.016327 -0.776316 -4.027611 1.248897
+Sum of squared residuals at call 57: 4.364078
+ 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
-85.00894 -0.7777917 -4.026307 1.24772
+ 85.008938 -0.777792 -4.026307 1.247720
Sum of squared residuals at call 61: 4.364052
-85.00894 -0.7777917 -4.026307 1.24772
+ 85.008939 -0.777792 -4.026307 1.247720
Sum of squared residuals at call 62: 4.364052
-85.00894 -0.7777917 -4.026307 1.24772
-85.00894 -0.7777917 -4.026307 1.24772
+ 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
-85.00518 -0.7773082 -4.026004 1.248453
+ 85.005185 -0.777308 -4.026004 1.248453
Sum of squared residuals at call 65: 4.362751
-85.00519 -0.7773082 -4.026004 1.248453
-85.00518 -0.7773083 -4.026004 1.248453
+ 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
-85.00518 -0.7773082 -4.026005 1.248453
-85.00518 -0.7773082 -4.026004 1.248453
-85.00134 -0.7776046 -4.025878 1.248775
+ 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
-85.00134 -0.7776046 -4.025878 1.248775
+ 85.001345 -0.777605 -4.025878 1.248775
Sum of squared residuals at call 71: 4.362721
-85.00134 -0.7776046 -4.025878 1.248775
+ 85.001344 -0.777605 -4.025878 1.248775
Sum of squared residuals at call 72: 4.362721
-85.00134 -0.7776046 -4.025878 1.248775
-85.00134 -0.7776046 -4.025878 1.248775
-85.0032 -0.7774734 -4.0257 1.248643
+ 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
-85.0032 -0.7774734 -4.0257 1.248643
-85.0032 -0.7774734 -4.0257 1.248643
+ 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
-85.0032 -0.7774735 -4.0257 1.248643
-85.0032 -0.7774734 -4.0257 1.248643
-85.0032 -0.7774734 -4.0257 1.248643
-85.0032 -0.7774734 -4.0257 1.248643
-85.00249 -0.7774909 -4.025911 1.248679
+ 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
-85.0025 -0.7774909 -4.025911 1.248679
+ 85.002496 -0.777491 -4.025911 1.248679
Sum of squared residuals at call 83: 4.362715
-85.00249 -0.7774909 -4.025911 1.248679
-85.00249 -0.7774905 -4.025911 1.248679
-85.00249 -0.7774914 -4.025911 1.248679
+ 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
-85.00249 -0.7774909 -4.025911 1.248679
-85.00249 -0.7774909 -4.025911 1.248679
-85.00249 -0.7774909 -4.025911 1.248679
-85.00249 -0.7774909 -4.025911 1.248679
-85.00274 -0.7774922 -4.025821 1.248672
+ 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
-85.00274 -0.7774922 -4.025821 1.248672
-85.00274 -0.7774922 -4.025821 1.248672
+ 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
-85.00274 -0.7774921 -4.025821 1.248672
+ 85.002737 -0.777492 -4.025821 1.248672
Sum of squared residuals at call 94: 4.362714
-85.00274 -0.7774922 -4.025821 1.248672
-85.00274 -0.7774922 -4.025821 1.248672
-85.00274 -0.7774922 -4.025821 1.248672
-85.00274 -0.7774922 -4.025821 1.248672
-85.00274 -0.7774922 -4.025821 1.248672
-85.00273 -0.7774912 -4.025817 1.24867
+ 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
-85.00275 -0.7774912 -4.025817 1.24867
-85.00271 -0.7774912 -4.025817 1.24867
-85.00273 -0.7774905 -4.025817 1.24867
-85.00273 -0.7774919 -4.025817 1.24867
-85.00273 -0.7774912 -4.025814 1.24867
-85.00273 -0.7774912 -4.025821 1.24867
-85.00273 -0.7774912 -4.025817 1.248671
-85.00273 -0.7774912 -4.025817 1.248669
-85.00274 -0.7774913 -4.025819 1.248671
+ 85.002752 -0.777491 -4.025817 1.248670
+ 85.002710 -0.777491 -4.025817 1.248670
+ 85.00273 -0.77749 -4.02582 1.24867
+ 85.002731 -0.777492 -4.025817 1.248670
+ 85.002731 -0.777491 -4.025814 1.248670
+ 85.002731 -0.777491 -4.025821 1.248670
+ 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
-85.00276 -0.7774913 -4.025819 1.248671
-85.00272 -0.7774913 -4.025819 1.248671
-85.00274 -0.7774904 -4.025819 1.248671
-85.00274 -0.7774922 -4.025819 1.248671
-85.00274 -0.7774913 -4.025815 1.248671
-85.00274 -0.7774913 -4.025822 1.248671
-85.00274 -0.7774913 -4.025819 1.248672
-85.00274 -0.7774913 -4.025819 1.248669
-85.00274 -0.7774913 -4.025819 1.248671
-85.00274 -0.7774913 -4.025819 1.248671 0.696237
+ 85.002758 -0.777491 -4.025819 1.248671
+ 85.002716 -0.777491 -4.025819 1.248671
+ 85.00274 -0.77749 -4.02582 1.24867
+ 85.002737 -0.777492 -4.025819 1.248671
+ 85.002737 -0.777491 -4.025815 1.248671
+ 85.002737 -0.777491 -4.025822 1.248671
+ 85.002737 -0.777491 -4.025819 1.248672
+ 85.002737 -0.777491 -4.025819 1.248669
+ 85.002737 -0.777491 -4.025819 1.248671
+ 85.002737 -0.777491 -4.025819 1.248671 0.696237

Contact - Imprint