Remove unused biquadratic exponential functions

Author: brenhinkeller

src/Utilities.jl

@@ -177,59 +177,4 @@
         return ll
     end
 
-## --- Biquadratic distribution (like bilinear, with quadratic sides)
-
-
-    struct BiquadraticExponential{T<:Real}
-        A::T
-        μ::T
-        σ::T
-        shp::T
-        skw::T
-    end
-    function BiquadraticExponential(p::AbstractVector)
-        @assert length(p) == 5
-        @assert all(x->x>0, Iterators.drop(p,1))
-        BiquadraticExponential(p...)
-    end
-
-    function biquadratic_exponential(x::Number, p::AbstractVector{<:Number})
-        @assert length(p) == 5
-        _, μ, σ, shp, skw = (abs(x) for x in p)
-        xs = (x - μ)/σ # X scaled by mean and variance
-        v = 1/2 - atan(xs)/3.141592653589793 # Sigmoid (positive on LHS)
-        return exp(first(p) -0.5*(shp*skw*xs*v - shp/skw*xs*(1-v))^2)
-    end
-    function biquadratic_exponential(x::AbstractVector, p::AbstractVector{<:Number})
-        @assert length(p) == 5
-        _, μ, σ, shp, skw = (abs(x) for x in p)
-        result = Array{float(eltype(x))}(undef,size(x))
-        @inbounds for i ∈ eachindex(x)
-            xs = (x[i] - μ)/σ # X scaled by mean and variance
-            v = 1/2 - atan(xs)/3.141592653589793 # Sigmoid (positive on LHS)
-            result[i] = exp(first(p) -0.5*(shp*skw*xs*v - shp/skw*xs*(1-v))^2)
-        end
-        return result
-    end
-
-    function biquadratic_exponential_ll(x::Number, p::AbstractVector{<:Number})
-        xs = (x - p[2])/abs(p[3]) # X scaled by mean and variance
-        v = 1/2 - atan(xs)/3.141592653589793 # Sigmoid (positive on LHS)
-        shp = abs(p[4])
-        skw = abs(p[5])
-        return -(shp*skw*xs*v - shp/skw*xs*(1-v))^2
-    end
-    function biquadratic_exponential_ll(x::AbstractVector, ages::AbstractVector{BiquadraticExponential{T}}) where T
-        ll = zero(T)
-        @inbounds for i ∈ eachindex(x,ages)
-            pᵢ = ages[i]
-            xs = (x[i]-pᵢ.μ)/(pᵢ.σ) # X scaled by mean and variance
-            v = 1/2 - atan(xs)/3.141592653589793 # Sigmoid (positive on LHS)
-            shp = pᵢ.shp
-            skw = pᵢ.skw
-            ll -= (shp*skw*xs*v - shp/skw*xs*(1-v))^2
-        end
-        return ll
-    end
-
 ## --- End of File

test/testUtilities.jl

@@ -17,13 +17,6 @@
     @test location(d * 2) == 66.00606672179812 * 2
     @test scale(d * 2) == 0.17739474265630253 * 2
 
-## --- Alternatively: biquadratic exponential
-
-    @test Chron.biquadratic_exponential(66.02, [-5.9345103368858085, 66.00606672179812, 0.17739474265630253, 70.57882331291309, 0.6017142541555505]) ≈ 1.3384991282229901e-5
-    @test Chron.biquadratic_exponential([66.02, 66.08, 66.15], [-5.9345103368858085, 66.00606672179812, 0.17739474265630253, 70.57882331291309, 0.6017142541555505]) ≈ [1.3384991282229901e-5, 5.441899612287734e-128, 0.0]
-    @test Chron.biquadratic_exponential_ll(66.02, [-5.9345103368858085, 66.00606672179812, 0.17739474265630253, 70.57882331291309, 0.6017142541555505]) ≈ -10.573732390830594
-
-
 ## --- Other utility functions for log likelihoods
 
     @test Chron.strat_ll([0.0, 0.0], [Normal(0,1), Normal(0,1)]) ≈ 0