finish renaming

TuringLang · Nov 7, 2024 · 9517682 · 9517682
1 parent e4e7583
commit 9517682
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/ext/JuliaBUGSMCMCChainsExt.jl b/ext/JuliaBUGSMCMCChainsExt.jl
@@ -84,7 +84,7 @@ function JuliaBUGS.gen_chains(
     g = model.g
 
     generated_vars = find_generated_vars(g)
-    generated_vars = [v for v in model.eval_cache.sorted_nodes if v in generated_vars] # keep the order
+    generated_vars = [v for v in model.flattened_graph_node_data.sorted_nodes if v in generated_vars] # keep the order
 
     param_vals = []
     generated_quantities = []

diff --git a/src/gibbs.jl b/src/gibbs.jl
@@ -32,7 +32,8 @@ function AbstractMCMC.step(
         conditioned_model = AbstractPPL.condition(
             model, variable_to_condition_on, model.evaluation_env
         )
-        cached_eval_caches[variable_to_condition_on] = conditioned_model.eval_cache
+        cached_eval_caches[variable_to_condition_on] =
+            conditioned_model.flattened_graph_node_data
     end
     param_values = JuliaBUGS.getparams(model)
     return param_values, GibbsState(param_values, conditioning_schedule, cached_eval_caches)

diff --git a/test/graphs.jl b/test/graphs.jl
@@ -47,11 +47,12 @@ c = @varname c
 cond_model = AbstractPPL.condition(model, setdiff(model.parameters, [c]))
 # tests for MarkovBlanketBUGSModel constructor
 @test cond_model.parameters == [c]
-@test Set(Symbol.(cond_model.eval_cache.sorted_nodes)) == Set([:l, :a, :b, :f, :c])
+@test Set(Symbol.(cond_model.flattened_graph_node_data.sorted_nodes)) ==
+    Set([:l, :a, :b, :f, :c])
 
 decond_model = AbstractPPL.decondition(cond_model, [a, l])
 @test Set(Symbol.(decond_model.parameters)) == Set([:a, :c, :l])
-@test Set(Symbol.(decond_model.eval_cache.sorted_nodes)) ==
+@test Set(Symbol.(decond_model.flattened_graph_node_data.sorted_nodes)) ==
     Set([:l, :b, :f, :a, :d, :e, :c, :h, :g, :i])
 
 c_value = 4.0