Skip to content

Commit 1774eb0

Browse files
committed
Remove generated functions
1 parent 3327219 commit 1774eb0

File tree

1 file changed

+6
-26
lines changed

1 file changed

+6
-26
lines changed

src/mh-core.jl

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -89,43 +89,23 @@ function propose(
8989
spl::MetropolisHastings{<:NamedTuple},
9090
model::DensityModel
9191
)
92-
proposal = _propose(spl.proposal, model)
93-
return Transition(model, proposal)
94-
end
95-
96-
@generated function _propose(
97-
proposals::NamedTuple{names},
98-
model::DensityModel
99-
) where {names}
100-
expr = Expr(:tuple)
101-
map(names) do f
102-
push!(expr.args, Expr(:(=), f, :(propose(proposals.$f, model)) ))
92+
proposal = map(spl.proposal) do p
93+
propose(p, model)
10394
end
104-
return expr
95+
return Transition(model, proposal)
10596
end
10697

10798
function propose(
10899
spl::MetropolisHastings{<:NamedTuple},
109100
model::DensityModel,
110101
params_prev::Transition
111102
)
112-
proposal = _propose(spl.proposal, model, params_prev.params)
113-
return Transition(model, proposal)
114-
end
115-
116-
@generated function _propose(
117-
proposals::NamedTuple{names},
118-
model::DensityModel,
119-
params_prev::NamedTuple
120-
) where {names}
121-
expr = Expr(:tuple)
122-
map(names) do f
123-
push!(expr.args, Expr(:(=), f, :(propose(proposals.$f, model, params_prev.$f)) ))
103+
proposal = map(spl.proposal, params_prev.params) do p, params
104+
propose(p, model, params)
124105
end
125-
return expr
106+
return Transition(model, proposal)
126107
end
127108

128-
129109
# Evaluate the likelihood of t conditional on t_cond.
130110
function q(
131111
spl::MetropolisHastings{<:AbstractArray},

0 commit comments

Comments
 (0)