From 194659fcaccdd1ee37851725b8c72e99daa3a8cf Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Wed, 10 Apr 2019 10:17:35 +0200 Subject: Adapt tests, vignettes and examples - Write the NEWS - Static documentation rebuilt by pkgdown - Adapt mkinerrmin - Fix (hopefully all) remaining problems in mkinfit --- tests/testthat/test_schaefer07_complex_case.R | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'tests/testthat/test_schaefer07_complex_case.R') diff --git a/tests/testthat/test_schaefer07_complex_case.R b/tests/testthat/test_schaefer07_complex_case.R index 844dd88f..66ebc03b 100644 --- a/tests/testthat/test_schaefer07_complex_case.R +++ b/tests/testthat/test_schaefer07_complex_case.R @@ -57,10 +57,11 @@ test_that("Complex test case from Schaefer (2007) can be reproduced (10% toleran r$mkin.deviation <- abs(round(100 * ((r$mkin - r$means)/r$means), digits=1)) expect_equal(r$mkin.deviation < 10, rep(TRUE, 14)) - # If we use optimisation algorithm 'Marq' we get a local minimum with a - # sum of squared residuals of 273.3707 - # When using 'Marq', we need to give a good starting estimate e.g. for k_A2 in + # In previous versions of mkinfit, if we used optimisation algorithm 'Marq' + # we got a local minimum with a sum of squared residuals of 273.3707 + # When using 'Marq', we needed to give a good starting estimate e.g. for k_A2 in # order to get the optimum with sum of squared residuals 240.5686 - expect_equal(round(fit.default$ssr, 4), 240.5686) + ssr <- sum(fit.default$data$residual^2) + expect_equal(round(ssr, 4), 240.5686) }) -- cgit v1.2.1