Use DomainErrors with informative messages

Author: juliangehring

src/model.jl

@@ -43,8 +43,7 @@ partitioning the empirical distribution of p-values. Bioinformatics 19,
 
 """
 function BetaUniformMixtureModel(π0::AbstractFloat, α::AbstractFloat = 0.5, β::AbstractFloat = 1.0)
-    if !isin(π0, 0., 1.)
-        throw(DomainError())
-    end
-    MixtureModel([Beta(α, β), Uniform()], [1-π0, π0])
+    isin(π0, 0, 1) || throw(DomainError("π0 must be in [0, 1]"))
+    bum = MixtureModel([Beta(α, β), Uniform()], [1-π0, π0])
+    return bum
 end

src/pi0-estimators.jl

@@ -84,7 +84,10 @@ Series B (Statistical Methodology) 66, 187–205.
 struct Storey <: Pi0Estimator
     λ::Float64
 
-    Storey(λ) = isin(λ, 0, 1) ? new(λ) : throw(DomainError())
+    function Storey(λ)
+        isin(λ, 0, 1) || throw(DomainError("λ must be in [0, 1]"))
+        return new(λ)
+    end
 end
 
 Storey() = Storey(0.1)
@@ -131,8 +134,11 @@ struct StoreyBootstrap <: Pi0Estimator
     λseq::Vector{Float64}
     q   ::Float64
 
-    StoreyBootstrap(λseq, q) =
-        isin(λseq, 0, 1) && isin(q, 0, 1) ? new(λseq, q) : throw(DomainError())
+    function StoreyBootstrap(λseq, q)
+        isin(λseq, 0, 1) || throw(DomainError("λseq must be in [0, 1]"))
+        isin(q, 0, 1) || throw(DomainError("q must be in [0, 1]"))
+        return new(λseq, q)
+    end
 end
 
 StoreyBootstrap() = StoreyBootstrap(0.05:0.05:0.95, 0.1)
@@ -229,7 +235,10 @@ julia> estimate_pi0(pvals, Oracle(0.5)) # a bit boring...
 struct Oracle <: Pi0Estimator
     π0::Float64
 
-    Oracle(π0) = isin(π0, 0, 1) ? new(π0) : throw(DomainError())
+    function Oracle(π0)
+        isin(π0, 0, 1) || throw(DomainError("π0 must be in [0, 1]"))
+        return new(π0)
+    end
 end
 
 Oracle() = Oracle(1.0)
@@ -269,7 +278,10 @@ struct TwoStep <: Pi0Estimator
     α::Float64
     adjustment::PValueAdjustment
 
-    TwoStep(α, method) = isin(α, 0, 1) ? new(α, method) : throw(DomainError())
+    function TwoStep(α, method)
+        isin(α, 0, 1) || throw(DomainError("α must be in [0, 1]"))
+        return new(α, method)
+    end
 end
 
 TwoStep() = TwoStep(0.05)
@@ -313,8 +325,10 @@ Statistical Society: Series B (Statistical Methodology) 74, 163–182.
 struct RightBoundary <: Pi0Estimator
     λseq::Vector{Float64}
 
-    RightBoundary(λseq) =
-        isin(λseq, 0, 1) ? new(λseq) : throw(DomainError())
+    function RightBoundary(λseq)
+        isin(λseq, 0, 1) || throw(DomainError("λseq must be in [0, 1]"))
+        return new(λseq)
+    end
 end
 
 # λseq used in Liang, Nettleton 2012
@@ -366,11 +380,11 @@ struct CensoredBUM <: Pi0Estimator
     maxiter::Int64
 
     function CensoredBUM(γ0, λ, xtol, maxiter)
-        if isin(γ0, 0, 1) && isin(λ, 0, 1) && isin(xtol, 0, 1) && maxiter > 0
-            new(γ0, λ, xtol, maxiter)
-        else
-            throw(DomainError())
-        end
+        isin(γ0, 0, 1) || throw(DomainError("γ0 must be in [0, 1]"))
+        isin(λ, 0, 1) || throw(DomainError("λ must be in [0, 1]"))
+        isin(xtol, 0, 1) || throw(DomainError("xtol must be in [0, 1]"))
+        maxiter > 0 || throw(DomainError("maxiter must be a positive number"))
+        return new(γ0, λ, xtol, maxiter)
     end
 end
 
@@ -495,11 +509,10 @@ struct BUM <: Pi0Estimator
     maxiter::Int64
 
     function BUM(γ0, xtol, maxiter)
-        if isin(γ0, 0, 1) && isin(xtol, 0, 1)
-            new(γ0, xtol, maxiter)
-        else
-            throw(DomainError())
-        end
+        isin(γ0, 0, 1) || throw(DomainError("γ0 must be in [0, 1]"))
+        isin(xtol, 0, 1) || throw(DomainError("xtol must be in [0, 1]"))
+        maxiter > 0 || throw(DomainError("maxiter must be a positive number"))
+        return new(γ0, xtol, maxiter)
     end
 end
 
@@ -620,11 +633,10 @@ struct ConvexDecreasing <: Pi0Estimator
     maxiter::Int64
 
     function ConvexDecreasing(gridsize, xtol, maxiter)
-        if gridsize > 0 && isin(xtol, 0, 1) && maxiter > 0
-            new(gridsize, xtol, maxiter)
-        else
-            throw(DomainError())
-        end
+        gridsize > 0 || throw(DomainError("gridsize must be a positive number"))
+        isin(xtol, 0, 1) || throw(DomainError("xtol must be in [0, 1]"))
+        maxiter > 0 || throw(DomainError("maxiter must be a positive number"))
+        return new(gridsize, xtol, maxiter)
     end
 end
 

src/types.jl

@@ -21,9 +21,9 @@ struct PValues{T<:AbstractFloat} <: AbstractVector{T}
     function(::Type{PValues})(values::AbstractVector{T}) where T
         min, max = extrema(values)
         if min < zero(T) || max > one(T)
-            throw(DomainError())
+            throw(DomainError("p-values must all be in [0, 1]"))
         end
-        new{T}(copy(values), min, max)
+        return new{T}(copy(values), min, max)
     end
 end
 

src/utils.jl

@@ -41,7 +41,7 @@ end
 
 function valid_pvalues(x::AbstractVector{T}) where T<:AbstractFloat
     if !isin(x)
-        throw(DomainError())
+        throw(DomainError("p-values must all be in [0, 1]"))
     end
 end