Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "InverseAlgos"
uuid = "64ff6778-433b-4901-a403-25308785a0c4"
authors = ["Andrea Zunino <inverseproblem@users.noreply.github.com>"]
version = "0.2.3"
version = "0.2.4"

[deps]
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
Expand Down
2 changes: 1 addition & 1 deletion src/Samplers/hammcsampler.jl
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ A single iteration of the HMC algorithm, where a given number of
function oneiterhmc_polyg(nlogppd::NLogPostPDF,HMCpar::HMCParams,mcur::Vector{Float64},Ucur::Float64,
grptask::Array{Int,2})

maxbreakcheck = 20
maxbreakcheck = Int(floor(HMCpar.L*0.1))

#bodyindicesorg = nlogppd.likelihood()
# mnew = nothing
Expand Down
18 changes: 12 additions & 6 deletions src/Samplers/nuts_polyg.jl
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,10 @@ function leapfrog_pos_polyg(m, p, ϵ, usermodel,HMCpar,grptask)
if isdefined(usermodel.likelihood,:dofwdchecks) && usermodel.likelihood.dofwdchecks
# checksucceded = fwdchecks!(usermodel.likelihood,mcur,mnew,pnew,il,HMCpar.L)
checksucceded = usermodel.likelihood(m,mtilde,ptilde,lowcon,upcon,HMCpar.LcholmassM,"performchecks")
# get out
return mtilde,ptilde,checksucceded
if checksucceded==false
# get out
return mtilde,ptilde,checksucceded
end
else
# in case there are no checks
checksucceded = true
Expand Down Expand Up @@ -324,8 +326,10 @@ function leapfrog_mom_polyg(m, p, ϵ, usermodel,HMCpar,grptask)
if isdefined(usermodel.likelihood,:dofwdchecks) && usermodel.likelihood.dofwdchecks
# checksucceded = fwdchecks!(usermodel.likelihood,mcur,mnew,pnew,il,HMCpar.L)
checksucceded = usermodel.likelihood(m,mtilde,ptilde,lowcon,upcon,HMCpar.LcholmassM,"performchecks")
# get out
return mtilde,ptilde,checksucceded
if checksucceded==false
# get out
return mtilde,ptilde,checksucceded
end
else
# in case there are no checks
checksucceded = true
Expand Down Expand Up @@ -366,8 +370,10 @@ function leapfrog_mom_polyg(m, p, ϵ, usermodel,HMCpar,grptask)
if isdefined(usermodel.likelihood,:dofwdchecks) && usermodel.likelihood.dofwdchecks
# checksucceded = fwdchecks!(usermodel.likelihood,mcur,mnew,pnew,il,HMCpar.L)
checksucceded = usermodel.likelihood(m,mtilde,ptilde,lowcon,upcon,HMCpar.LcholmassM,"performchecks")
# get out
return mtilde,ptilde,checksucceded
if checksucceded==false
# get out
return mtilde,ptilde,checksucceded
end
else
# in case there are no checks
checksucceded = true
Expand Down