From a0bb14f8b1b3d4fbc59df6a02dca7553a2f5b319 Mon Sep 17 00:00:00 2001 From: Ken Kellner Date: Thu, 27 Jul 2023 13:27:32 -0400 Subject: Fix introduced bug with NB --- R/gdistsamp.R | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/R/gdistsamp.R b/R/gdistsamp.R index 2c09bbf..c43076a 100644 --- a/R/gdistsamp.R +++ b/R/gdistsamp.R @@ -2,7 +2,7 @@ gdistsamp <- function(lambdaformula, phiformula, pformula, data, keyfun=c("halfnorm", "exp", "hazard", "uniform"), output=c("abund", "density"), unitsOut=c("ha", "kmsq"), - mixture=c('P', 'NB', 'ZIP'), K, starts, method = "BFGS", se = TRUE, engine=c("C","R"), + mixture=c("P", "NB", 'ZIP'), K, starts, method = "BFGS", se = TRUE, engine=c("C","R"), rel.tol=1e-4, threads=1, ...) { if(!is(data, "unmarkedFrameGDS")) @@ -111,15 +111,13 @@ else { if(identical(mixture, "NB")) { nOP <- 1 nbPar <- "alpha" - } -if(identical(mixture, "ZIP")) { +} else if(identical(mixture, "ZIP")) { nOP <- 1 nbPar <- "psi" - } -else { +} else { nOP <- 0 nbPar <- character(0) - } +} nLP <- ncol(Xlam) nP <- nLP + nPP + nDP + nSP + nOP -- cgit v1.2.3