fixes

Author: penelopeysm

models/dppl_hmm_semisup.jl

@@ -53,7 +53,7 @@ end
         end
         gamma .= temp_gamma
     end
-    DynamicPPL.@addlogprob! logsumexp(gamma)
+    @addlogprob! logsumexp(gamma)
 end
 
 model = dppl_hmm_semisup(K, T, T_unsup, w, z, u, alpha, beta)

models/dppl_lda.jl

@@ -9,26 +9,22 @@ theta = rand(Dirichlet(alpha), m)
 doc_lengths = rand(Poisson(1_000), m)
 n = sum(doc_lengths)
 
-w_lda = Vector{Int}(undef, n)
-doc_lda = Vector{Int}(undef, n)
+w = Vector{Int}(undef, n)
+doc = Vector{Int}(undef, n)
 for i in 1:m
-    # Because all the models exist in the same scope, we need
-    # to add some variable suffixes to avoid local/global 
-    # scope warnings. This is quite ugly and should be solved
-    # properly, using e.g. modules or functions.
-    local idx_lda = sum(doc_lengths[1:i-1]) # starting index for inner loop
+    local idx = sum(doc_lengths[1:i-1]) # starting index for inner loop
     for j in 1:doc_lengths[i]
-        z_lda = rand(Categorical(theta[:, i]))
-        w_lda[idx_lda + j] = rand(Categorical(phi[:, z_lda]))
-        doc_lda[idx_lda + j] = i
+        z = rand(Categorical(theta[:, i]))
+        w[idx + j] = rand(Categorical(phi[:, z]))
+        doc[idx + j] = i
     end
 end
 
 @model function dppl_lda(k, m, w, doc, alpha, beta)
     theta ~ filldist(Dirichlet(alpha), m)
     phi ~ filldist(Dirichlet(beta), k)
     log_phi_dot_theta = log.(phi * theta)
-    DynamicPPL.@addlogprob! sum(log_phi_dot_theta[CartesianIndex.(w, doc)])
+    @addlogprob! sum(log_phi_dot_theta[CartesianIndex.(w, doc)])
 end
 
-model = dppl_lda(k, m, w_lda, doc_lda, alpha, beta)
+model = dppl_lda(k, m, w, doc, alpha, beta)