Skip to content

Commit 0a1cb8f

Browse files
racinmatracinmat
committed
migrated obsdim back from kwarg to arg
1 parent f366a88 commit 0a1cb8f

File tree

10 files changed

+88
-85
lines changed

10 files changed

+88
-85
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ encoding it supports `ObsDim`, which can be used to specify which
145145
dimension of the array denotes the observations.
146146

147147
```julia
148-
julia> convertlabel(LabelEnc.OneOfK{Int}, true_targets, obsdim = 1)
148+
julia> convertlabel(LabelEnc.OneOfK{Int}, true_targets, 1)
149149
# 5×2 Array{Int64,2}:
150150
# 0 1
151151
# 1 0

‎docs/api/targets.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ about the labels, but their structure.
210210
2
211211
3
212212
213-
julia> label([0 1 0; 1 0 0; 0 1 0; 0 0 1], obsdim = 1)
213+
julia> label([0 1 0; 1 0 0; 0 1 0; 0 0 1], 1) # positional obsdim
214214
3-element Array{Int64,1}:
215215
1
216216
2

‎src/MLLabelUtils.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import LearnBase: ind2label,
2323
labelenc,
2424
islabelenc,
2525
convertlabelview
26+
using LearnBase: default_obsdim
2627

2728
export
2829

‎src/classify.jl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,21 +50,21 @@ end
5050
LearnBase.classify(values::AbstractVector, ::Type{<:LabelEnc.OneOfK}) = argmax(values)
5151
LearnBase.classify(values::AbstractVector, lm::LabelEnc.OneOfK) = classify(values, typeof(lm))
5252

53-
LearnBase.classify(values::AbstractMatrix, T::Type{<:LabelEnc.OneOfK}; obsdim = default_obsdim(values)) =
54-
classify!(Vector{Int}(undef, size(values, obsdim)), values, T; obsdim = obsdim)
55-
LearnBase.classify(values::AbstractMatrix, lm::LabelEnc.OneOfK; obsdim = default_obsdim(values)) =
56-
classify(values, typeof(lm); obsdim=obsdim)
53+
LearnBase.classify(values::AbstractMatrix, T::Type{<:LabelEnc.OneOfK}, obsdim = default_obsdim(values)) =
54+
classify!(Vector{Int}(undef, size(values, obsdim)), values, T, obsdim)
55+
LearnBase.classify(values::AbstractMatrix, lm::LabelEnc.OneOfK, obsdim = default_obsdim(values)) =
56+
classify(values, typeof(lm), obsdim)
5757

5858
function LearnBase.classify!(buffer::AbstractVector, values::AbstractMatrix,
59-
T::Type{<:LabelEnc.OneOfK}; obsdim = default_obsdim(values))
59+
T::Type{<:LabelEnc.OneOfK}, obsdim = default_obsdim(values))
6060
for (i, v) in enumerate(eachslice(values; dims = obsdim))
6161
buffer[i] = classify(v, T)
6262
end
6363

6464
return buffer
6565
end
66-
LearnBase.classify!(buffer, values::AbstractMatrix, lm::LabelEnc.OneOfK; obsdim = default_obsdim(obsdim)) =
67-
classify!(buffer, values, typeof(lm); obsdim=obsdim)
66+
LearnBase.classify!(buffer, values::AbstractMatrix, lm::LabelEnc.OneOfK, obsdim = default_obsdim(obsdim)) =
67+
classify!(buffer, values, typeof(lm), obsdim)
6868

6969
"""
7070
classify!(out, x, encoding)

‎src/convertlabel.jl

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -40,22 +40,23 @@ function LearnBase.convertlabelview(dst::LearnBase.VectorLabelEncoding{T,2},
4040
end
4141

4242
function LearnBase.convertlabelview(dst::LearnBase.VectorLabelEncoding{T,K},
43-
values::AbstractVector{V},
44-
src::LearnBase.VectorLabelEncoding{V,K}) where {T,K,V}
43+
values::AbstractVector{V},
44+
src::LearnBase.VectorLabelEncoding{V,K}) where {T,K,V}
4545
f = x -> convertlabel(dst, x, src)
4646
finv = x -> convertlabel(src, x, dst)
4747
MappedArray{T,1,typeof(values),typeof(f),typeof(finv)}(f, finv, values)
4848
end
4949

5050
## General Vector based
5151

52-
function LearnBase.convertlabel(dst::LearnBase.VectorLabelEncoding{T,K}, x, src::LearnBase.VectorLabelEncoding{S,K}) where {T,K,S}
52+
function LearnBase.convertlabel(dst::LearnBase.VectorLabelEncoding{T,K}, x,
53+
src::LearnBase.VectorLabelEncoding{S,K}) where {T,K,S}
5354
ind2label(label2ind(x, src), dst)::T
5455
end
5556

5657
function LearnBase.convertlabel(dst::LearnBase.VectorLabelEncoding{T,K},
57-
values::AbstractVector,
58-
src::LearnBase.VectorLabelEncoding{S,K}) where {T,K,S}
58+
values::AbstractVector,
59+
src::LearnBase.VectorLabelEncoding{S,K}) where {T,K,S}
5960
convertlabel.(dst, values, src)::_array_type(T,Val{1})
6061
end
6162

@@ -65,14 +66,14 @@ function LearnBase.convertlabel(::Type{L}, x, src::LearnBase.LabelEncoding{T,K})
6566
convertlabel(_lm(L,Val{K}), x, src)
6667
end
6768

68-
function LearnBase.convertlabel(::Type{L}, values::AbstractArray{Bool}, src::LearnBase.LabelEncoding{T,K};
69-
kwargs...) where {L<:LearnBase.LabelEncoding,T,K}
70-
convertlabel(_lm(L,Val{K}), values, src; kwargs...)
69+
function LearnBase.convertlabel(::Type{L}, values::AbstractArray{Bool}, src::LearnBase.LabelEncoding{T,K},
70+
args...) where {L<:LearnBase.LabelEncoding,T,K}
71+
convertlabel(_lm(L,Val{K}), values, src, args...)
7172
end
7273

73-
function LearnBase.convertlabel(::Type{L}, values::AbstractArray{T}, src::LearnBase.LabelEncoding{S,K};
74-
kwargs...) where {L<:LearnBase.LabelEncoding,T,S,K}
75-
convertlabel(_lm(L,T,Val{K}), values, src; kwargs...)
74+
function LearnBase.convertlabel(::Type{L}, values::AbstractArray{T}, src::LearnBase.LabelEncoding{S,K},
75+
args...) where {L<:LearnBase.LabelEncoding,T,S,K}
76+
convertlabel(_lm(L,T,Val{K}), values, src, args...)
7677
end
7778

7879
function LearnBase.convertlabel(dst::LearnBase.LabelEncoding{T,K,M}, values::AbstractMatrix) where {T,K,M}
@@ -93,47 +94,48 @@ end
9394

9495
## NativeLabels
9596

96-
function LearnBase.convertlabel(dst, values, src_lbl::AbstractVector; kwargs...)
97-
convertlabel(dst, values, LabelEnc.NativeLabels(src_lbl); kwargs...)
97+
function LearnBase.convertlabel(dst, values, src_lbl::AbstractVector, args...)
98+
convertlabel(dst, values, LabelEnc.NativeLabels(src_lbl), args...)
9899
end
99100

100101
# NativeLabels binary inference helper
101102

102-
function LearnBase.convertlabel(dst_lbl::AbstractVector{T}, values, src::LearnBase.LabelEncoding{S,K};
103-
kwargs...) where {T,S,K}
104-
convertlabel(LabelEnc.NativeLabels{T,K}(dst_lbl), values, src; kwargs...)
103+
function LearnBase.convertlabel(dst_lbl::AbstractVector{T}, values, src::LearnBase.LabelEncoding{S,K},
104+
args...) where {T,S,K}
105+
@info LabelEnc.NativeLabels{T,K}(dst_lbl)
106+
convertlabel(LabelEnc.NativeLabels{T,K}(dst_lbl), values, src, args...)
105107
end
106108

107-
function LearnBase.convertlabel(dst::LearnBase.LabelEncoding{S,K}, values, src_lbl::AbstractVector{T};
108-
kwargs...) where {S,K,T}
109-
convertlabel(dst, values, LabelEnc.NativeLabels{T,K}(src_lbl); kwargs...)
109+
function LearnBase.convertlabel(dst::LearnBase.LabelEncoding{S,K}, values, src_lbl::AbstractVector{T},
110+
args...) where {S,K,T}
111+
convertlabel(dst, values, LabelEnc.NativeLabels{T,K}(src_lbl), args...)
110112
end
111113

112-
function LearnBase.convertlabel(::Type{L}, values, src_lbl::AbstractVector{T};
113-
kwargs...) where {L<:LearnBase.BinaryLabelEncoding,T}
114-
convertlabel(L, values, LabelEnc.NativeLabels{T,2}(src_lbl); kwargs...)
114+
function LearnBase.convertlabel(::Type{L}, values, src_lbl::AbstractVector{T},
115+
args...) where {L<:LearnBase.BinaryLabelEncoding,T}
116+
convertlabel(L, values, LabelEnc.NativeLabels{T,2}(src_lbl), args...)
115117
end
116118

117119
## OneOfK obsdim kw specified
118120

119-
LearnBase.convertlabel(dst, values; obsdim = LearnBase.default_obsdim(values)) =
120-
convertlabel(dst, values, labelenc(values); obsdim = obsdim)
121+
LearnBase.convertlabel(dst, values, obsdim::Union{Nothing, Integer} = default_obsdim(values)) =
122+
convertlabel(dst, values, labelenc(values), obsdim)
121123

122-
LearnBase.convertlabel(dst, values::AbstractMatrix; obsdim = LearnBase.default_obsdim(values)) =
123-
convertlabel(dst, values, labelenc(values; obsdim = obsdim); obsdim = obsdim)
124+
LearnBase.convertlabel(dst, values::AbstractMatrix, obsdim::Integer = default_obsdim(values)) =
125+
convertlabel(dst, values, labelenc(values, obsdim), obsdim)
124126

125127
## To OneOfK
126128

127129
LearnBase.convertlabel(dst::LabelEnc.OneOfK{TD,K},
128130
values::AbstractMatrix,
129-
src::LabelEnc.OneOfK{TS,K};
130-
kwargs...) where {TD,TS,K} =
131+
src::LabelEnc.OneOfK{TS,K},
132+
obsdim::Integer = default_obsdim(values)) where {TD,TS,K} =
131133
_array_type(TD, Val{2})(values)
132134

133135
function LearnBase.convertlabel(dst::LabelEnc.OneOfK{T,K},
134136
values::AbstractVector,
135-
src::LearnBase.VectorLabelEncoding{S,KS};
136-
obsdim = LearnBase.default_obsdim(_array_type(T, Val{2}))) where {T,K,S,KS}
137+
src::LearnBase.VectorLabelEncoding{S,KS},
138+
obsdim = default_obsdim(_array_type(T, Val{2}))) where {T,K,S,KS}
137139
@assert KS <= K
138140
n = length(values)
139141
buffer = (obsdim == 1) ? _array_type(T, Val{2})(zeros(T, n, K)) : _array_type(T, Val{2})(zeros(T, K, n))
@@ -152,8 +154,8 @@ end
152154

153155
function LearnBase.convertlabel(dst::LearnBase.VectorLabelEncoding{TD,K},
154156
values::AbstractMatrix{T},
155-
src::LabelEnc.OneOfK{TS,K};
156-
obsdim = LearnBase.default_obsdim(values)) where {TD,T,TS,K}
157+
src::LabelEnc.OneOfK{TS,K},
158+
obsdim = default_obsdim(values)) where {TD,T,TS,K}
157159
not_obsdim = mod1(obsdim + 1, 2)
158160
@assert size(values, not_obsdim) == K
159161
n = size(values, obsdim)

‎src/labelencoding.jl

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ LearnBase.label(lm::LabelEnc.NativeLabels) = lm.label
383383
LearnBase.label(itr) = _arrange_label(unique(itr))
384384
LearnBase.label(A::AbstractVector) = _arrange_label(unique(A))
385385
LearnBase.label(A::AbstractArray{T,N}) where {T,N} = throw(MethodError(label, (A,)))
386-
LearnBase.label(A::AbstractMatrix{<:Union{Number,Bool}}; obsdim = LearnBase.default_obsdim(A)) =
386+
LearnBase.label(A::AbstractMatrix{<:Union{Number,Bool}}, obsdim = default_obsdim(A)) =
387387
collect(1:size(A, mod1(obsdim + 1, 2)))
388388

389389
# make sure pos label is first
@@ -533,21 +533,21 @@ function LearnBase.islabelenc(targets::AbstractVector, lm::LabelEnc.NativeLabels
533533
end
534534
end
535535

536-
function LearnBase.islabelenc(targets::AbstractMatrix{<:Union{Bool,Number}}, lm::LabelEnc.OneOfK;
536+
function LearnBase.islabelenc(targets::AbstractMatrix{<:Union{Bool,Number}}, lm::LabelEnc.OneOfK,
537537
obsdim = default_obsdim(targets))
538-
islabelenc(targets, typeof(lm); obsdim = obsdim)
538+
islabelenc(targets, typeof(lm), obsdim)
539539
end
540540

541-
LearnBase.islabelenc(targets::AbstractMatrix{T}, ::Type{LabelEnc.OneOfK{T}};
541+
LearnBase.islabelenc(targets::AbstractMatrix{T}, ::Type{LabelEnc.OneOfK{T}},
542542
obsdim = default_obsdim(targets)) where {T<:Union{Bool,Number}} =
543-
islabelenc(targets, LabelEnc.OneOfK; obsdim = obsdim)
543+
islabelenc(targets, LabelEnc.OneOfK, obsdim)
544544

545-
LearnBase.islabelenc(targets::AbstractMatrix{T}, ::Type{LabelEnc.OneOfK{T, K}};
545+
LearnBase.islabelenc(targets::AbstractMatrix{T}, ::Type{LabelEnc.OneOfK{T, K}},
546546
obsdim = default_obsdim(targets)) where {T<:Union{Bool,Number}, K} =
547547
(size(targets, mod1(obsdim + 1, 2)) != K) ? false :
548-
islabelenc(targets, LabelEnc.OneOfK; obsdim = obsdim)
548+
islabelenc(targets, LabelEnc.OneOfK, obsdim)
549549

550-
function LearnBase.islabelenc(targets::AbstractMatrix{T}, ::Type{LabelEnc.OneOfK};
550+
function LearnBase.islabelenc(targets::AbstractMatrix{T}, ::Type{LabelEnc.OneOfK},
551551
obsdim = default_obsdim(targets)) where {T<:Union{Bool,Number}}
552552
k, n = (obsdim != 1) ? size(targets) : reverse(size(targets))
553553

@@ -614,5 +614,5 @@ function LearnBase.labelenc(targets::AbstractVector{T}) where {T<:Number}
614614
end
615615

616616
# TODO: Multilabel (Matrix as targets)
617-
LearnBase.labelenc(targets::AbstractMatrix{T}; obsdim = default_obsdim(targets)) where {T<:Number} =
617+
LearnBase.labelenc(targets::AbstractMatrix{T}, obsdim = default_obsdim(targets)) where {T<:Number} =
618618
LabelEnc.OneOfK(T, size(targets, mod1(obsdim + 1, 2)))

‎src/learnbase.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ label and the second element the negative label.
4545
label(itr) = _arrange_label(unique(itr))
4646
label(A::AbstractVector) = _arrange_label(convert(Vector, (unique(A))))
4747
label(A::AbstractArray{T,N}) where {T,N} = throw(MethodError(label, (A,)))
48-
label(A::AbstractMatrix{<:Union{Number,Bool}}; obsdim = LearnBase.default_obsdim(A)) =
48+
label(A::AbstractMatrix{<:Union{Number,Bool}}, obsdim = default_obsdim(A)) =
4949
label(A, Val(obsdim))
5050
label(A::AbstractMatrix{<:Union{Number,Bool}}, ::Val{2}) = collect(1:size(A,1))
5151
label(A::AbstractMatrix{<:Union{Number,Bool}}, ::Val{1}) = collect(1:size(A,2))

‎test/tst_classify.jl

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -101,24 +101,24 @@ end
101101
1 0 2 1 2 1 2;
102102
0 2 1 0 0 2 0]
103103
@test @inferred(classify(A, LabelEnc.OneOfK)) == [1,3,2,1,2,3,2]
104-
@test @inferred(classify(A, LabelEnc.OneOfK; obsdim=2)) == [1,3,2,1,2,3,2]
104+
@test @inferred(classify(A, LabelEnc.OneOfK, 2)) == [1,3,2,1,2,3,2]
105105
@test @inferred(classify(A, LabelEnc.OneOfK(Val{3}))) == [1,3,2,1,2,3,2]
106-
@test @inferred(classify(A, LabelEnc.OneOfK(Val{3}); obsdim=2)) == [1,3,2,1,2,3,2]
106+
@test @inferred(classify(A, LabelEnc.OneOfK(Val{3}), 2)) == [1,3,2,1,2,3,2]
107107
@test eltype(classify(A, LabelEnc.OneOfK)) <: Int
108-
@test eltype(classify(A, LabelEnc.OneOfK; obsdim=2)) <: Int
108+
@test eltype(classify(A, LabelEnc.OneOfK, 2)) <: Int
109109
@test eltype(classify(A, LabelEnc.OneOfK(Val{3}))) <: Int
110-
@test eltype(classify(A, LabelEnc.OneOfK(Val{3}); obsdim=2)) <: Int
110+
@test eltype(classify(A, LabelEnc.OneOfK(Val{3}), 2)) <: Int
111111
buffer = zeros(7)
112-
@test @inferred(classify!(buffer, A, LabelEnc.OneOfK(3); obsdim=2)) == [1,3,2,1,2,3,2]
112+
@test @inferred(classify!(buffer, A, LabelEnc.OneOfK(3), 2)) == [1,3,2,1,2,3,2]
113113
@test buffer == [1,3,2,1,2,3,2]
114114
At = A'
115-
@test @inferred(classify(At, LabelEnc.OneOfK; obsdim=1)) == [1,3,2,1,2,3,2]
116-
@test @inferred(classify(At, LabelEnc.OneOfK(Val{3}); obsdim=1)) == [1,3,2,1,2,3,2]
117-
@test eltype(classify(At, LabelEnc.OneOfK; obsdim=1)) <: Int
115+
@test @inferred(classify(At, LabelEnc.OneOfK, 1)) == [1,3,2,1,2,3,2]
116+
@test @inferred(classify(At, LabelEnc.OneOfK(Val{3}), 1)) == [1,3,2,1,2,3,2]
117+
@test eltype(classify(At, LabelEnc.OneOfK, 1)) <: Int
118118
@test eltype(classify(At, LabelEnc.OneOfK(Val{3}))) <: Int
119-
@test eltype(classify(At, LabelEnc.OneOfK(Val{3}); obsdim=1)) <: Int
119+
@test eltype(classify(At, LabelEnc.OneOfK(Val{3}), 1)) <: Int
120120
buffer = zeros(7)
121-
@test @inferred(classify!(buffer, At, LabelEnc.OneOfK; obsdim=1)) == [1,3,2,1,2,3,2]
121+
@test @inferred(classify!(buffer, At, LabelEnc.OneOfK, 1)) == [1,3,2,1,2,3,2]
122122
@test buffer == [1,3,2,1,2,3,2]
123123
end
124124
end

‎test/tst_convertlabel.jl

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -254,13 +254,13 @@ println("<HEARTBEAT>")
254254
@test res == dst_x
255255

256256
# kw obsdim
257-
res = convertlabel(dst_lm, x; obsdim=2)
257+
res = convertlabel(dst_lm, x, 2)
258258
@test typeof(res) <: typeof(dst_x)
259259
@test res == dst_x
260-
res = convertlabel(dst_lm, xt; obsdim=1)
260+
res = convertlabel(dst_lm, xt, 1)
261261
@test typeof(res) <: typeof(dst_x)
262262
@test res == dst_x
263-
res = convertlabel(dst_lm, xt, LabelEnc.OneOfK(2); obsdim=1)
263+
res = convertlabel(dst_lm, xt, LabelEnc.OneOfK(2), 1)
264264
@test typeof(res) <: typeof(dst_x)
265265
@test res == dst_x
266266
end
@@ -298,16 +298,16 @@ println("<HEARTBEAT>")
298298
@test res == dst_x
299299

300300
# kw obsdim
301-
res = convertlabel(dst_lm, src_x; obsdim=2)
301+
res = convertlabel(dst_lm, src_x, 2)
302302
@test typeof(res) <: typeof(dst_x)
303303
@test res == dst_x
304-
res = convertlabel(dst_lm, src_x, src_lm; obsdim=2)
304+
res = convertlabel(dst_lm, src_x, src_lm, 2)
305305
@test typeof(res) <: typeof(dst_x)
306306
@test res == dst_x
307-
res = convertlabel(dst_lm, src_x; obsdim=1)
307+
res = convertlabel(dst_lm, src_x, 1)
308308
@test typeof(res) <: typeof(dst_x)
309309
@test res == dst_x'
310-
res = convertlabel(dst_lm, src_x, src_lm; obsdim=1)
310+
res = convertlabel(dst_lm, src_x, src_lm, 1)
311311
@test typeof(res) <: typeof(dst_x)
312312
@test res == dst_x'
313313
end
@@ -341,29 +341,29 @@ println("<HEARTBEAT>")
341341
@test res == dst_x
342342

343343
# kw obsdim
344-
res = convertlabel(dst_lm, x; obsdim=2)
344+
res = convertlabel(dst_lm, x, 2)
345345
@test typeof(res) <: typeof(dst_x)
346346
@test res == dst_x
347-
res = convertlabel(dst_lm, x, LabelEnc.OneOfK(3); obsdim=2)
347+
res = convertlabel(dst_lm, x, LabelEnc.OneOfK(3), 2)
348348
@test typeof(res) <: typeof(dst_x)
349349
@test res == dst_x
350-
res = convertlabel(dst_lm, xt; obsdim=1)
350+
res = convertlabel(dst_lm, xt, 1)
351351
@test typeof(res) <: typeof(dst_x)
352352
@test res == dst_x
353-
res = convertlabel(dst_lm, xt, LabelEnc.OneOfK(3); obsdim=1)
353+
res = convertlabel(dst_lm, xt, LabelEnc.OneOfK(3), 1)
354354
@test typeof(res) <: typeof(dst_x)
355355
@test res == dst_x
356356
end
357357
end
358358
# To OneOfK
359359
@testset "implicit NativeLabels" begin
360-
res = @inferred convertlabel(LabelEnc.OneOfK(Int,3), [:a,:b,:c,:b,:c,:a], [:a,:b,:c]; obsdim=1)
360+
res = @inferred convertlabel(LabelEnc.OneOfK(Int,3), [:a,:b,:c,:b,:c,:a], [:a,:b,:c], 1)
361361
@test typeof(res) <: typeof(x)
362362
@test res == x'
363-
res = convertlabel(LabelEnc.OneOfK, [:a,:b,:c,:b,:c,:a], [:a,:b,:c]; obsdim=1)
363+
res = convertlabel(LabelEnc.OneOfK, [:a,:b,:c,:b,:c,:a], [:a,:b,:c], 1)
364364
@test typeof(res) <: typeof(x)
365365
@test res == x'
366-
res = convertlabel(LabelEnc.OneOfK{Float64}, [:a,:b,:c,:b,:c,:a], [:a,:b,:c]; obsdim=1)
366+
res = convertlabel(LabelEnc.OneOfK{Float64}, [:a,:b,:c,:b,:c,:a], [:a,:b,:c], 1)
367367
@test typeof(res) <: Matrix{Float64}
368368
@test res == x'
369369
end
@@ -383,16 +383,16 @@ println("<HEARTBEAT>")
383383
@test res == dst_x
384384

385385
# kw obsdim
386-
res = convertlabel(dst_lm, src_x; obsdim=2)
386+
res = convertlabel(dst_lm, src_x, 2)
387387
@test typeof(res) <: typeof(dst_x)
388388
@test res == dst_x
389-
res = convertlabel(dst_lm, src_x, src_lm; obsdim=2)
389+
res = convertlabel(dst_lm, src_x, src_lm, 2)
390390
@test typeof(res) <: typeof(dst_x)
391391
@test res == dst_x
392-
res = convertlabel(dst_lm, src_x; obsdim=1)
392+
res = convertlabel(dst_lm, src_x, 1)
393393
@test typeof(res) <: typeof(dst_x)
394394
@test res == dst_x'
395-
res = convertlabel(dst_lm, src_x, src_lm; obsdim=1)
395+
res = convertlabel(dst_lm, src_x, src_lm, 1)
396396
@test typeof(res) <: typeof(dst_x)
397397
@test res == dst_x'
398398
end

‎test/tst_labelencoding.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
@test_throws MethodError label(rand(2,2,3))
3434
@test_throws MethodError label([:yes :no; :yes :no])
3535
@test @inferred(label(rand(5,10))) == collect(1:5)
36-
@test @inferred(label(rand(5,10); obsdim=1)) == collect(1:10)
37-
@test label(rand(5,10); obsdim=1) == collect(1:10)
36+
@test @inferred(label(rand(5,10), 1)) == collect(1:10)
37+
@test label(rand(5,10), 1) == collect(1:10)
3838
end
3939
end
4040

@@ -581,9 +581,9 @@ end
581581
# check is the format is correctly recognized
582582
@test @inferred(islabelenc(dst_x, dst_lm)) == true
583583
@test @inferred(islabelenc(dst_x', dst_lm)) == false
584-
@test @inferred(islabelenc(dst_x, dst_lm; obsdim = 2)) == true
585-
@test @inferred(islabelenc(dst_x', dst_lm; obsdim = 1)) == true
586-
@test @inferred(islabelenc(dst_x', dst_lm, obsdim = 2)) == false
587-
@test @inferred(islabelenc(dst_x, dst_lm, obsdim = 1)) == false
584+
@test @inferred(islabelenc(dst_x, dst_lm, 2)) == true
585+
@test @inferred(islabelenc(dst_x', dst_lm, 1)) == true
586+
@test @inferred(islabelenc(dst_x', dst_lm, 2)) == false
587+
@test @inferred(islabelenc(dst_x, dst_lm, 1)) == false
588588
end
589589
end

0 commit comments

Comments
 (0)