Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/backends.jl
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ end
function Base.show(io::IO, ::MIME"text/plain", observations::SageObs)
A = observations.features
y = observations.target
println(io, "SaffronObs")
println(io, "SageObs")
println(io, " features :: $(typeof(A))($(size(A)))")
println(io, " names: $(observations.names)")
println(io, " target :: $(typeof(y))($(size(y)))")
Expand Down
6 changes: 6 additions & 0 deletions src/tarragon.jl
Original file line number Diff line number Diff line change
Expand Up @@ -186,3 +186,9 @@ end

# involutivity:
obs(model, observations::BasicObs, ::Tarragon) = observations

# data deconstructors:
LearnAPI.features(learner, observations::BasicObs, ::Tarragon) =
BasicObs(observations.features, observations.names)
LearnAPI.features(learner, data, frontend::Tarragon) =
LearnAPI.features(learner, obs(learner, data), frontend)
25 changes: 25 additions & 0 deletions test/backends.jl
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
using Test
using LearnDataFrontEnds
import CategoricalArrays

@testset "show methods" begin
x = fill(0,2,3)
y = [3, 2, 1]
names = [:x1, :x2]
ycat = CategoricalArrays.categorical(y)
c = LearnDataFrontEnds.classes(ycat)
d = LearnDataFrontEnds.decoder(ycat)
mime = MIME"text/plain"()

@test sprint(show, mime, LearnDataFrontEnds.BasicObs(x, names)) ==
"BasicObs\n features :: Matrix{Int64}((2, 3))\n names: [:x1, :x2]\n"
@test sprint(show, mime, LearnDataFrontEnds.SaffronObs(x, names, y)) ==
"SaffronObs\n features :: Matrix{Int64}((2, 3))\n names: "*
"[:x1, :x2]\n target :: Vector{Int64}((3,))"
@test sprint(show, mime, LearnDataFrontEnds.SageObs(x, names, y, c, d)) ==
"SageObs\n features :: Matrix{Int64}((2, 3))\n names: "*
"[:x1, :x2]\n target :: Vector{Int64}((3,))\n classes_seen: "*
"[1, 2, 3] (categorical vector with complete pool)\n decoder: <callable>"
end

true
1 change: 1 addition & 0 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ using Test

test_files = [
"tools.jl",
"backends.jl",
"saffron.jl",
"sage.jl",
"tarragon.jl",
Expand Down
5 changes: 5 additions & 0 deletions test/tarragon.jl
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,10 @@ LearnAPI.learner(model::TruncatedSVDFitted) = model.learner
LearnAPI.obs(learner::TruncatedSVD, data) = fitobs(learner, data, Tarragon())
LearnAPI.obs(model::TruncatedSVDFitted, data) = obs(model, data, Tarragon())

# training data deconstructor:
LearnAPI.features(learner::TruncatedSVD, data) =
LearnAPI.features(learner, data, Tarragon())

function LearnAPI.fit(learner::TruncatedSVD, observations::Obs; verbosity=1)

x = observations.features # p x n matrix
Expand Down Expand Up @@ -198,6 +202,7 @@ model0 = fit(learner, X)
@testset "matrix features for fit" begin
observations = obs(learner, x)
feats = LearnAPI.features(learner, observations)
@test LearnAPI.features(learner, x).features == feats.features
@test feats isa Obs
@test feats.features == x
@test feats.names == [:x1, :x2, :x3, :x4, :x5]
Expand Down
Loading