From 307a317666b8a1cdfe2293371ad8671403680a36 Mon Sep 17 00:00:00 2001
From: Johannes Ranke <jranke@uni-bremen.de>
Date: Tue, 4 Jun 2019 21:10:58 +0200
Subject: Fix a bug introduced in the last commit

---
 R/mkinfit.R | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'R')

diff --git a/R/mkinfit.R b/R/mkinfit.R
index 13c7aa90..60697cb1 100644
--- a/R/mkinfit.R
+++ b/R/mkinfit.R
@@ -505,13 +505,15 @@ mkinfit <- function(mkinmod, observed,
           upper = upper[names(parms.start)],
           control = control, ...)
         fit$logLik <- - nlogLik.current
+
         if (error_model_algorithm == "d_3") {
-          if (abs((fit_direct$logLik - fit$logLik))/mean(c(fit_direct$logLik, fit$logLik)) < 0.001) {
+          rel_diff <- abs((fit_direct$logLik - fit$logLik))/-mean(c(fit_direct$logLik, fit$logLik))
+          if (rel_diff < 0.0001) {
             if (!quiet) {
               message("Direct fitting and three-step fitting yield approximately the same likelihood")
             }
           } else {
-            if (fit_direct$logLik < fit$logLik) {
+            if (fit$logLik > fit_direct$logLik) {
               if (!quiet) message("Three-step fitting yielded a higher likelihood than direct fitting")
             } else {
               if (!quiet) message("Direct fitting yielded a higher likelihood than three-step fitting")
-- 
cgit v1.2.1