diff --git a/src/cluster.jl b/src/cluster.jl index a36a8fd..77de15e 100644 --- a/src/cluster.jl +++ b/src/cluster.jl @@ -6,10 +6,10 @@ using Statistics using FillArrays #maskfolder = "data/forestcompressed" -function meanvote(orbits, significance_thresh=-1.28) +function meanvote(orbits, significance_thresh=50) s, n = 0.0, 0 for i in eachindex(orbits) - if orbits[i] != 0 && !isnan(orbits[i]) + if !ismissing(orbits[i]) && orbits[i] != 0 && !isnan(orbits[i]) s += orbits[i] n += 1 end @@ -22,7 +22,7 @@ function filtersmallcomps!( xout, xin_unfiltered, forestmask, comborbits, connsize; dims=:, threaded=false ) xin = broadcast(xin_unfiltered, forestmask) do x, m - ismissing(m) ? zero(x) : x * m + ismissing(m) ? zero(x) : x * (m == 1) end x = similar(Array{Float64}, (axes(xin, 1), axes(xin, 2), Base.OneTo(1))) for j in axes(x, 2), i in axes(x, 1)