remove n_site from gen_hybridproblem_synthetic

Author: bgctw

dev/doubleMM.jl

@@ -29,8 +29,8 @@ cdev = gdev isa MLDataDevices.AbstractGPUDevice ? cpu_device() : identity
 
 #------ setup synthetic data and training data loader
 prob0_ = HybridProblem(DoubleMM.DoubleMMCase(); scenario);
-(; xM, n_site, θP_true, θMs_true, xP, y_global_true, y_true, y_global_o, y_o, y_unc
-) = gen_hybridproblem_synthetic(rng, prob0_; scenario);
+(; xM, θP_true, θMs_true, xP, y_global_true, y_true, y_global_o, y_o, y_unc
+) = gen_hybridproblem_synthetic(rng, DoubleMM.DoubleMMCase(); scenario);
 n_site, n_batch = get_hybridproblem_n_site_and_batch(prob0_; scenario)
 ζP_true, ζMs_true = log.(θP_true), log.(θMs_true)
 i_sites = 1:n_site

src/DoubleMM/f_doubleMM.jl

@@ -253,7 +253,6 @@ function HVI.gen_hybridproblem_synthetic(rng::AbstractRNG, prob::DoubleMMCase;
     y_o = y_true .+ randn(rng, FloatType, size(y_true)) .* σ_o
     (;
         xM,
-        n_site,
         θP_true = θP,
         θMs_true,
         xP,

test/test_HybridProblem.jl

@@ -49,7 +49,7 @@ construct_problem = (;scenario=(:default,)) -> begin
     # n_batch = 10
     n_site, n_batch = get_hybridproblem_n_site_and_batch(CP.DoubleMM.DoubleMMCase(); scenario)
     # dependency on DeoubleMMCase -> take care of changes in covariates
-    (; xM, n_site, θP_true, θMs_true, xP, y_global_true, y_true, y_global_o, y_o, y_unc
+    (; xM, θP_true, θMs_true, xP, y_global_true, y_true, y_global_o, y_o, y_unc
     ) = gen_hybridproblem_synthetic(rng, DoubleMM.DoubleMMCase())
     n_covar = size(xM,1)
     n_input = (:covarK2 ∈ scenario) ? n_covar +1 : n_covar

test/test_doubleMM.jl

@@ -36,8 +36,9 @@ par_templates = get_hybridproblem_par_templates(prob; scenario)
 end
 
 rng = StableRNG(111) # make sure to be the same as when constructing train_dataloader
-(; xM, n_site, θP_true, θMs_true, xP, y_global_true, y_true, y_global_o, y_o, y_unc
+(; xM, θP_true, θMs_true, xP, y_global_true, y_true, y_global_o, y_o, y_unc
 ) = gen_hybridproblem_synthetic(rng, prob; scenario);
+n_site, n_batch = get_hybridproblem_n_site_and_batch(prob; scenario)
 i_sites = 1:n_site
 fneglogden = get_hybridproblem_neg_logden_obs(prob; scenario)
 

test/test_elbo.jl

@@ -38,7 +38,7 @@ test_scenario = (scenario) -> begin
     #θsite_true = get_hybridproblem_par_templates(prob; scenario)
     n_covar = 5
     n_site, n_batch = get_hybridproblem_n_site_and_batch(prob; scenario)
-    (; xM, n_site, θP_true, θMs_true, xP, y_global_true, y_true, y_global_o, y_o, y_unc
+    (; xM, θP_true, θMs_true, xP, y_global_true, y_true, y_global_o, y_o, y_unc
     ) = gen_hybridproblem_synthetic(rng, prob; scenario);
 
     g, ϕg0 = get_hybridproblem_MLapplicator(prob; scenario);

test/test_sample_zeta.jl

@@ -23,7 +23,7 @@ scenario = (:default,)
 
 n_θM, n_θP = length.(values(get_hybridproblem_par_templates(prob; scenario)))
 
-(; xM, n_site, θP_true, θMs_true, xP, y_global_true, y_true, y_global_o, y_o
+(; xM, θP_true, θMs_true, xP, y_global_true, y_true, y_global_o, y_o
 ) = gen_hybridproblem_synthetic(rng, prob; scenario)
 
 FT = get_hybridproblem_float_type(prob; scenario)