Skip to content

Commit 04a1338

Browse files
sharanrydevmotion
andauthored
Apply suggestions from code review by @devmotion
Co-Authored-By: David Widmann <[email protected]>
1 parent 8b821db commit 04a1338

File tree

1 file changed

+16
-14
lines changed

1 file changed

+16
-14
lines changed

src/kernels/gabor.jl

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import Base.getproperty
2-
31
"""
42
GaborKernel(; ell::Real=1.0, p::Real=1.0)
53
@@ -10,12 +8,10 @@ Gabor kernel with length scale ell and period p. Given by
108
119
"""
1210
struct GaborKernel{T<:Real, K<:Kernel} <: BaseKernel
13-
κ::K
11+
kernel::K
1412
function GaborKernel(;ell=nothing, p=nothing)
1513
k = _gabor(ell=ell, p=p)
16-
if ell == nothing ell=1.0 end
17-
if p == nothing p=1.0 end
18-
new{Union{typeof(ell),typeof(p)}, typeof(k)}(k)
14+
new{typeof(k)}(k)
1915
end
2016
end
2117

@@ -36,14 +32,20 @@ end
3632
function Base.getproperty(k::GaborKernel, v::Symbol)
3733
if v ==
3834
return getfield(k, v)
39-
elseif v == :ell && typeof(k.κ.kernels[1]) <: SqExponentialKernel
40-
return 1.0
41-
elseif v == :ell && typeof(k.κ.kernels[1]) <: TransformedKernel
42-
return 1 ./ k.κ.kernels[1].transform.s[1]
43-
elseif v == :p && typeof(k.κ.kernels[2]) <: CosineKernel
44-
return 1.0
45-
elseif v == :p && typeof(k.κ.kernels[2]) <: TransformedKernel
46-
return 1 ./ k.κ.kernels[2].transform.s[1]
35+
elseif v == :ell
36+
kernel1 = k.κ.kernels[1]
37+
if kernel1 isa TransformedKernel
38+
return 1 ./ kernel1.transform.s[1]
39+
else
40+
return 1.0
41+
end
42+
elseif v == :p
43+
kernel2 = k.κ.kernels[2]
44+
if kernel2 isa TransformedKernel
45+
return 1 ./ kernel2.transform.s[1]
46+
else
47+
return 1.0
48+
end
4749
else
4850
error("Invalid Property")
4951
end

0 commit comments

Comments
 (0)