avoid a deepcopy

Author: stecrotti

src/Models/epidemics/sirs_bp.jl

@@ -17,10 +17,9 @@ nstates(::SIRSFactor, l::Integer) = l == 0 ? 1 : 2
 
 
 function mpbp(sirs::SIRS{T,N,F}; kw...) where {T,N,F}
-    sirs_ = deepcopy(sirs)
-    g = IndexedBiDiGraph(sirs_.g.A)
-    w = sirs_factors(sirs_)
-    return mpbp(g, w, fill(3, nv(g)), T, ϕ=sirs_.ϕ, ψ=sirs_.ψ; kw...)
+    g = IndexedBiDiGraph(sirs.g.A)
+    w = sirs_factors(sirs)
+    return mpbp(g, w, fill(3, nv(g)), T, ϕ=sirs.ϕ, ψ=sirs.ψ; kw...)
 end
 
 function prob_y(wᵢ::SIRSFactor, xᵢᵗ⁺¹, xᵢᵗ, yᵗ, d)

src/Models/epidemics/sis_bp.jl

@@ -37,17 +37,15 @@ function (fᵢ::SISFactor)(xᵢᵗ⁺¹::Integer, xₙᵢᵗ::AbstractVector{<:I
 end
 
 function mpbp(sis::SIS{T,N,F}; kw...) where {T,N,F}
-    sis_ = deepcopy(sis)
-    g = IndexedBiDiGraph(sis_.g.A)
-    w = sis_factors(sis_)
-    return mpbp(g, w, fill(2, nv(g)), T, ϕ=sis_.ϕ, ψ=sis_.ψ; kw...)
+    g = IndexedBiDiGraph(sis.g.A)
+    w = sis_factors(sis)
+    return mpbp(g, w, fill(2, nv(g)), T, ϕ=sis.ϕ, ψ=sis.ψ; kw...)
 end
 
 function periodic_mpbp(sis::SIS{T,N,F}; kw...) where {T,N,F}
-    sis_ = deepcopy(sis)
-    g = IndexedBiDiGraph(sis_.g.A)
-    w = sis_factors(sis_)
-    return periodic_mpbp(g, w, fill(2, nv(g)), T, ϕ=sis_.ϕ, ψ=sis_.ψ; kw...)
+    g = IndexedBiDiGraph(sis.g.A)
+    w = sis_factors(sis)
+    return periodic_mpbp(g, w, fill(2, nv(g)), T, ϕ=sis.ϕ, ψ=sis.ψ; kw...)
 end
 
 # neighbor j is susceptible -> does nothing

src/Models/epidemics/sis_heterogeneous_bp.jl

@@ -40,17 +40,15 @@ function (fᵢ::SIS_heterogeneousFactor)(xᵢᵗ⁺¹::Integer, xᵗ::AbstractVe
 end
 
 function mpbp(sis::SIS_heterogeneous{T,N,F}; kw...) where {T,N,F}
-    sis_ = deepcopy(sis)
-    g = IndexedBiDiGraph(sis_.g.A)
-    w = sis_heterogeneous_factors(sis_)
-    return mpbp(g, w, fill(2, nv(g)), T, ϕ=sis_.ϕ, ψ=sis_.ψ; kw...)
+    g = IndexedBiDiGraph(sis.g.A)
+    w = sis_heterogeneous_factors(sis)
+    return mpbp(g, w, fill(2, nv(g)), T, ϕ=sis.ϕ, ψ=sis.ψ; kw...)
 end
 
 function periodic_mpbp(sis::SIS_heterogeneous{T,N,F}; kw...) where {T,N,F}
-    sis_ = deepcopy(sis)
-    g = IndexedBiDiGraph(sis_.g.A)
-    w = sis_heterogeneous_factors(sis_)
-    return periodic_mpbp(g, w, fill(2, nv(g)), T, ϕ=sis_.ϕ, ψ=sis_.ψ; kw...)
+    g = IndexedBiDiGraph(sis.g.A)
+    w = sis_heterogeneous_factors(sis)
+    return periodic_mpbp(g, w, fill(2, nv(g)), T, ϕ=sis.ϕ, ψ=sis.ψ; kw...)
 end
 
 # neighbor j is susceptible -> does nothing

test/sis_small_tree.jl

@@ -110,35 +110,35 @@
         @test logl_bp ≈ logp
     end
 
-    ### Periodic version
-    bp = periodic_mpbp(sis)
-    rng = MersenneTwister(111)
-    X, _ = onesample(bp; rng)
+    @testset "SIS small tree - periodic" begin
+        bp = periodic_mpbp(sis)
+        rng = MersenneTwister(111)
+        X, _ = onesample(bp; rng)
 
-    draw_node_observations!(bp.ϕ, X, N, last_time=true; rng)
+        reset!(bp; observations=true)
+        draw_node_observations!(bp.ϕ, X, N, last_time=true; rng)
 
-    svd_trunc = TruncBondMax(10)
-    iterate!(bp, maxiter=10; svd_trunc, showprogress=false)
+        svd_trunc = TruncBondMax(10)
+        iterate!(bp, maxiter=10; svd_trunc, showprogress=false)
 
-    b_bp = beliefs(bp)
-    p_bp = [[bbb[2] for bbb in bb] for bb in b_bp]
+        b_bp = beliefs(bp)
+        p_bp = [[bbb[2] for bbb in bb] for bb in b_bp]
 
-    p_exact, Z_exact = exact_prob(bp)
-    b_exact = exact_marginals(bp; p_exact)
-    p_ex = [[bbb[2] for bbb in bb] for bb in b_exact]
+        p_exact, Z_exact = exact_prob(bp)
+        b_exact = exact_marginals(bp; p_exact)
+        p_ex = [[bbb[2] for bbb in bb] for bb in b_exact]
 
-    f_bethe = bethe_free_energy(bp)
-    Z_bp = exp(-f_bethe)
+        f_bethe = bethe_free_energy(bp)
+        Z_bp = exp(-f_bethe)
 
-    local f(x,i) = x-1
+        local f(x,i) = x-1
 
-    r_bp = autocorrelations(f, bp)
-    r_exact = exact_autocorrelations(f, bp; p_exact)
+        r_bp = autocorrelations(f, bp)
+        r_exact = exact_autocorrelations(f, bp; p_exact)
 
-    c_bp = autocovariances(f, bp)
-    c_exact = exact_autocovariances(f, bp; r = r_exact)
+        c_bp = autocovariances(f, bp)
+        c_exact = exact_autocovariances(f, bp; r = r_exact)
 
-    @testset "SIS small tree - periodic" begin
         @test Z_exact ≈ Z_bp
         @test p_ex ≈ p_bp
         @test r_bp ≈ r_exact