Skip to content

Commit efa1479

Browse files
committed
Fixed bugs
1 parent 87be861 commit efa1479

File tree

4 files changed

+18
-15
lines changed

4 files changed

+18
-15
lines changed

src/kernels/kernelproduct.jl

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,23 +29,26 @@ hadamard(x,y) = x.*y
2929
function kernelmatrix(
3030
κ::KernelProduct,
3131
X::AbstractMatrix;
32-
obsdim::Int=defaultobs)
33-
reduce(hadamard,kernelmatrix.kernels[i],X,obsdim=obsdim) for i in 1:length(κ))
32+
obsdim::Int=defaultobs,
33+
)
34+
reduce(hadamard, kernelmatrix.kernels[i], X, obsdim = obsdim) for i in 1:length(κ))
3435
end
3536

3637
function kernelmatrix(
3738
κ::KernelProduct,
3839
X::AbstractMatrix,
3940
Y::AbstractMatrix;
40-
obsdim::Int=defaultobs)
41-
reduce(hadamard,_kernelmatrix.kernels[i],X,Y,obsdim) for i in 1:length(κ))
41+
obsdim::Int=defaultobs,
42+
)
43+
reduce(hadamard, kernelmatrix.kernels[i], X, Y, obsdim = obsdim) for i in 1:length(κ))
4244
end
4345

4446
function kerneldiagmatrix(
4547
κ::KernelProduct,
4648
X::AbstractMatrix;
47-
obsdim::Int=defaultobs) #TODO Add test
48-
reduce(hadamard,kerneldiagmatrix.kernels[i],X,obsdim=obsdim) for i in 1:length(κ))
49+
obsdim::Int=defaultobs,
50+
) #TODO Add test
51+
reduce(hadamard, kerneldiagmatrix.kernels[i], X, obsdim = obsdim) for i in 1:length(κ))
4952
end
5053

5154
function Base.show(io::IO, κ::KernelProduct)

src/kernels/kernelsum.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ function kernelmatrix(
5858
Y::AbstractMatrix;
5959
obsdim::Int = defaultobs,
6060
)
61-
sum.weights[i] * _kernelmatrix.kernels[i], X, Y, obsdim) for i in 1:length(κ))
61+
sum.weights[i] * kernelmatrix.kernels[i], X, Y, obsdim = obsdim) for i in 1:length(κ))
6262
end
6363

6464
function kerneldiagmatrix(

src/matrix/kernelmatrix.jl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ function kernelmatrix!(
2424
K::AbstractMatrix,
2525
κ::Kernel,
2626
X::AbstractMatrix;
27-
obsdim::Int = defaultobs
27+
obsdim::Int = defaultobs,
2828
)
2929
return kernelmatrix!(K, κ, vec_of_vecs(X, obsdim = obsdim))
3030
end
3131

3232
function kernelmatrix!(
3333
K::AbstractMatrix,
3434
κ::Kernel,
35-
X::AbstractVector
35+
X::AbstractVector,
3636
)
3737
if !check_dims(K, X, X)
3838
throw(DimensionMismatch("Dimensions of the target array K $(size(K)) are not consistent with X $(size(X))"))
@@ -60,7 +60,7 @@ function kernelmatrix!(
6060
κ::Kernel,
6161
X::AbstractMatrix,
6262
Y::AbstractMatrix;
63-
obsdim::Int = defaultobs
63+
obsdim::Int = defaultobs,
6464
)
6565
return kernelmatrix!(K, κ, vec_of_vecs(X, obsdim = obsdim), vec_of_vecs(Y, obsdim = obsdim))
6666
end
@@ -69,7 +69,7 @@ function kernelmatrix!(
6969
K::AbstractMatrix,
7070
κ::Kernel,
7171
X::AbstractVector,
72-
Y::AbstractVector
72+
Y::AbstractVector,
7373
)
7474
if !check_dims(K, X, Y)
7575
throw(DimensionMismatch("Dimensions of the target array K $(size(K)) are not consistent with X $(size(X)) and Y $(size(Y))"))
@@ -130,7 +130,7 @@ kerneldiagmatrix
130130
function kerneldiagmatrix(
131131
κ::Kernel,
132132
X::AbstractMatrix;
133-
obsdim::Int = defaultobs
133+
obsdim::Int = defaultobs,
134134
)
135135
return kerneldiagmatrix(κ, vec_of_vecs(X, obsdim = obsdim))
136136
end
@@ -146,7 +146,7 @@ function kerneldiagmatrix!(
146146
K::AbstractVector,
147147
κ::Kernel,
148148
X::AbstractMatrix;
149-
obsdim::Int = defaultobs
149+
obsdim::Int = defaultobs,
150150
)
151151
if length(K) != size(X,obsdim)
152152
throw(DimensionMismatch("Dimensions of the target array K $(size(K)) are not consistent with X $(size(X))"))
@@ -157,7 +157,7 @@ end
157157
function kerneldiagmatrix!(
158158
K::AbstractVector,
159159
κ::Kernel,
160-
X::AbstractVector
160+
X::AbstractVector,
161161
)
162162
if length(K) != length(X)
163163
throw(DimensionMismatch("Dimensions of the target array K $(size(K)) are not consistent with X $(length(X))"))

src/utils.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ end
5353

5454
Base.size(D::RowVecs) = (size(D.X, 1),)
5555
Base.getindex(D::RowVecs, i::Int) = view(D.X, i, :)
56-
Base.getindex(D::ColVecs, i::CartesianIndex{1}) = view(D.X, i, :)
56+
Base.getindex(D::RowVecs, i::CartesianIndex{1}) = view(D.X, i, :)
5757
Base.getindex(D::RowVecs, i) = RowVecs(view(D.X, i, :))
5858

5959
# Take highest Float among possibilities

0 commit comments

Comments
 (0)