Skip to content

GitLab

Commit 9f5cf399 authored by Oscar Jurado's avatar Oscar Jurado
Browse files

added theta_zero option to function, created ifelse for likelihood

parent cc5382ea
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
R/gevdfit.R
View file @ 9f5cf399
......@@ -76,7 +76,7 @@ gev.d.fit<-
mulink = make.link("identity"), siglink = make.link("identity"), shlink = make.link("identity"),
thetalink = make.link("identity"), etalink = make.link("identity"),
muinit = NULL, siginit = NULL, shinit = NULL, thetainit = NULL, etainit = NULL,
show = TRUE, method = "Nelder-Mead", maxit = 10000, init.vals = NULL, ...)
show = TRUE, method = "Nelder-Mead", maxit = 10000, init.vals = NULL, theta_zero = FALSE, ...)
{
z <- list()
......@@ -172,7 +172,7 @@ gev.d.fit<-
mu <- mulink$linkinv(mumat %*% (a[1:npmu]))
sigma <- siglink$linkinv(sigmat %*% (a[seq(npmu + 1, length = npsc)]))
xi <- shlink$linkinv(shmat %*% (a[seq(npmu + npsc + 1, length = npsh)]))
theta <- thetalink$linkinv(thmat %*% (a[seq(npmu + npsc + npsh + 1, length = npth)]))
ifelse(theta_zero, theta <- thetalink$linkinv(thmat %*% (a[seq(npmu + npsc + npsh + 1, length = npth)])), theta <- 0)
eta <- etalink$linkinv(etmat %*% (a[seq(npmu + npsc + npsh + npth + 1, length = npet)]))
ds.t <- ds+theta
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment