Skip to content

Commit 417e503

Browse files
committed
WIP consolidating nullhypo
1 parent b82c772 commit 417e503

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/ApproxConv.jl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,11 @@ function calcVariableDistanceExpectedFractional(ccwl::CommonConvWrapper,
134134
kappa::Float64=3.0 )
135135
#
136136
if sfidx in certainidx
137-
return kappa*maximum(Statistics.std(ccwl.params[sfidx], dims=2))
137+
# cannot calculate the stdev from uninitialized state
138+
msst = Statistics.std(ccwl.params[sfidx], dims=2)
139+
# FIXME use adaptive scale, see #802
140+
msst_ = 0 < sum(1e-10 .< msst) ? maximum(msst) : 1.0
141+
return kappa*msst_
138142
end
139143
# @assert !(sfidx in certainidx) "null hypo distance does not work for sfidx in certainidx"
140144

src/ExplicitDiscreteMarginalizations.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,7 @@ function assembleHypothesesElements!(mh::Nothing,
246246
push!(activehypo, (pidx,Int[]))
247247
end
248248
end
249-
250-
@show nullhypo, mhidx
249+
251250
return certainidx, allelements, activehypo, mhidx
252251
end
253252

0 commit comments

Comments
 (0)