Fixes to text decoding example

probcomp · Jul 2, 2019 · 6109388 · 6109388
1 parent d98bb2e
commit 6109388
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 260 deletions.
diff --git a/examples/decode/Manifest.toml b/examples/decode/Manifest.toml
diff --git a/examples/decode/Project.toml b/examples/decode/Project.toml
diff --git a/examples/decode/run.jl b/examples/decode/run.jl
@@ -76,7 +76,7 @@ function swap_involution(trace, fwd_choices::ChoiceMap, fwd_ret, proposal_args::
         constraints[replica => :text => l] = new_char
     end
 
-    (new_trace, weight, _, _) = update(trace, model_args, noargdiff, constraints)
+    (new_trace, weight, _, _) = update(trace, model_args, (NoChange(),), constraints)
     (new_trace, bwd_choices, weight)
 end
 
@@ -94,7 +94,7 @@ function exchange_involution(trace, fwd_choices::ChoiceMap, fwd_ret, proposal_ar
     replica_plus_one = (((replica-1)+1)%num_replicas)+1
     set_submap!(constraints, replica_plus_one, get_submap(choices, replica))
     set_submap!(constraints, replica, get_submap(choices, replica_plus_one))
-    (new_trace, weight, _, _) = update(trace, model_args, noargdiff, constraints)
+    (new_trace, weight, _, _) = update(trace, model_args, (NoChange(),), constraints)
     (new_trace, EmptyChoiceMap(), weight)
 end
 
@@ -132,6 +132,7 @@ function do_inference(encoded_text::AbstractString, num_iter::Int)
 
     # do MCMC
     for iter=1:num_iter
+        println("iter: $iter")
 
         # print state
         if (iter - 1) % 1 == 0
@@ -195,4 +196,4 @@ original_text_int = map((char) -> letter_to_int[char], collect(original_text))
 encoded_text = join(map((letter_int) -> alphabet[letter_int], code[original_text_int]))
 println("encoded text:")
 println(encoded_text)
-do_inference(encoded_text, 100000)
+do_inference(encoded_text, 1000)
diff --git a/examples/run_examples.jl b/examples/run_examples.jl
@@ -1,6 +1,7 @@
 using Gen
 using Test
 
+include("decode/run.jl")
 include("regression/static_mala.jl")
 include("regression/static_map_optimize.jl")
 include("regression/static_mh.jl")