aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Kellner <ken@kenkellner.com>2023-07-27 13:27:32 -0400
committerKen Kellner <ken@kenkellner.com>2023-07-27 13:27:32 -0400
commita0bb14f8b1b3d4fbc59df6a02dca7553a2f5b319 (patch)
tree23799a0701b146b3baeaa2a0c97c44c3dd47365a
parent05d0bb40969e25b88b68ac78a1301ad37f4fb8c8 (diff)
Fix introduced bug with NB
-rw-r--r--R/gdistsamp.R10
1 files 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