Merge pull request #65 from JuliaGaussianProcesses/tgf/unify_link

Use smart `link` constructor
JuliaGaussianProcesses · Jan 28, 2022 · 40d2790 · 40d2790 · theogf · Jan 28, 2022
2 parents d254543 + c5f7387
commit 40d2790
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 8 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "GPLikelihoods"
 uuid = "6031954c-0455-49d7-b3b9-3e1c99afaf40"
 authors = ["JuliaGaussianProcesses Team"]
-version = "0.2.6"
+version = "0.2.7"
 
 [deps]
 Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"

diff --git a/src/likelihoods/bernoulli.jl b/src/likelihoods/bernoulli.jl
@@ -14,7 +14,7 @@ struct BernoulliLikelihood{Tl<:AbstractLink} <: AbstractLikelihood
     invlink::Tl
 end
 
-BernoulliLikelihood(l=logistic) = BernoulliLikelihood(Link(l))
+BernoulliLikelihood(l=logistic) = BernoulliLikelihood(link(l))
 
 (l::BernoulliLikelihood)(f::Real) = Bernoulli(l.invlink(f))
 

diff --git a/src/likelihoods/categorical.jl b/src/likelihoods/categorical.jl
@@ -13,7 +13,7 @@ struct CategoricalLikelihood{Tl<:AbstractLink} <: AbstractLikelihood
     invlink::Tl
 end
 
-CategoricalLikelihood(l=softmax) = CategoricalLikelihood(Link(l))
+CategoricalLikelihood(l=softmax) = CategoricalLikelihood(link(l))
 
 (l::CategoricalLikelihood)(f::AbstractVector{<:Real}) = Categorical(l.invlink(vcat(f, 0)))
 

diff --git a/src/likelihoods/exponential.jl b/src/likelihoods/exponential.jl
@@ -11,7 +11,7 @@ struct ExponentialLikelihood{Tl<:AbstractLink} <: AbstractLikelihood
     invlink::Tl
 end
 
-ExponentialLikelihood(l=exp) = ExponentialLikelihood(Link(l))
+ExponentialLikelihood(l=exp) = ExponentialLikelihood(link(l))
 
 (l::ExponentialLikelihood)(f::Real) = Exponential(l.invlink(f))
 

diff --git a/src/likelihoods/gamma.jl b/src/likelihoods/gamma.jl
@@ -14,7 +14,7 @@ struct GammaLikelihood{T<:Real,Tl<:AbstractLink} <: AbstractLikelihood
 end
 
 GammaLikelihood(l) = GammaLikelihood(1.0, l)
-GammaLikelihood(α::Real=1.0, l=exp) = GammaLikelihood(α, Link(l))
+GammaLikelihood(α::Real=1.0, l=exp) = GammaLikelihood(α, link(l))
 
 @functor GammaLikelihood
 

diff --git a/src/likelihoods/gaussian.jl b/src/likelihoods/gaussian.jl
@@ -40,7 +40,7 @@ struct HeteroscedasticGaussianLikelihood{Tl<:AbstractLink} <: AbstractLikelihood
     invlink::Tl
 end
 
-HeteroscedasticGaussianLikelihood(l=exp) = HeteroscedasticGaussianLikelihood(Link(l))
+HeteroscedasticGaussianLikelihood(l=exp) = HeteroscedasticGaussianLikelihood(link(l))
 
 function (l::HeteroscedasticGaussianLikelihood)(f::AbstractVector{<:Real})
     return Normal(f[1], sqrt(l.invlink(f[2])))

diff --git a/src/likelihoods/poisson.jl b/src/likelihoods/poisson.jl
@@ -14,7 +14,7 @@ struct PoissonLikelihood{L<:AbstractLink} <: AbstractLikelihood
     invlink::L
 end
 
-PoissonLikelihood(l=exp) = PoissonLikelihood(Link(l))
+PoissonLikelihood(l=exp) = PoissonLikelihood(link(l))
 
 (l::PoissonLikelihood)(f::Real) = Poisson(l.invlink(f))
 

diff --git a/src/links.jl b/src/links.jl
@@ -23,6 +23,9 @@ struct Link{F} <: AbstractLink
     f::F
 end
 
+link(f) = Link(f)
+link(l::AbstractLink) = l
+
 (l::Link)(x) = l.f(x)
 
 Base.inv(l::Link) = Link(InverseFunctions.inverse(l.f))

diff --git a/test/links.jl b/test/links.jl
@@ -4,8 +4,11 @@
 
     # Generic link
     f = sin
-    l = Link(f)
+    l = GPLikelihoods.link(f)
+    @test l == Link(f)
     @test l(x) == f(x)
+    l = GPLikelihoods.link(ExpLink())
+    @test l == ExpLink()
 
     # Log
     l = LogLink()