From 0431f7742041adccc62dbd5e8bef2ac9834235b9 Mon Sep 17 00:00:00 2001
From: pwbogaart <pwbogaart@gmail.com>
Date: Mon, 8 May 2017 13:57:27 +0200
Subject: [PATCH] Improved errror message and disabled debug code

---
 pkg/R/data_checks.R    | 4 +++-
 pkg/R/trim_workhorse.R | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkg/R/data_checks.R b/pkg/R/data_checks.R
index 8ddf3c6..1504e86 100644
--- a/pkg/R/data_checks.R
+++ b/pkg/R/data_checks.R
@@ -105,7 +105,9 @@ print_and_capture <- function(x){
 assert_positive <- function(x, varname){
   if (any(x <= 0)){
     i <- which(x<=0)
-    stop(sprintf("Found zero or less counts for %s %s",varname, paste(names(x[i]),collapse=", ")),call.=FALSE)
+    msg <- if (is.null(varname)) sprintf("Found zero or less counts for %s", paste(names(x[i]),collapse=", "))
+           else                  sprintf("Found zero or less counts for %s %s",varname, paste(names(x[i]),collapse=", "))
+    stop(msg,call.=FALSE)
   }
   invisible(TRUE)
 }
diff --git a/pkg/R/trim_workhorse.R b/pkg/R/trim_workhorse.R
index 3242dee..f950a54 100644
--- a/pkg/R/trim_workhorse.R
+++ b/pkg/R/trim_workhorse.R
@@ -643,6 +643,9 @@ trim_workhorse <- function(count, site.id, year, month=NULL, covars=data.frame()
         V_i <- sig2 * d_mu_i
       }
       # if (any(abs(diag(V_i))<1e-12)) browser()
+      # printf("\n!!! Site: %d\n", i)
+      # print(mu_i)
+      # if (any(mu_i < 6e-18)) browser()
       V_inv[[i]] <<- solve(V_i) # Store $V^{-1}# for later use
       Omega[[i]] <<- d_mu_i %*% V_inv[[i]] %*% d_mu_i # idem for $\Omega_i$
     }