update

PharmCat · Aug 31, 2021 · 5a3b344 · 5a3b344 · PharmCat · Aug 31, 2021
1 parent 3cdb493
commit 5a3b344
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/types.jl b/src/types.jl
@@ -277,7 +277,7 @@ function subset(d::DataSet{T}, sort::Dict) where T <: AbstractIDResult
     if length(inds) > 0 return DataSet(d.ds[inds]) end
     DataSet(Vector{T}(undef, 0))
 end
-function subset(d::DataSet{T}, inds) where T 
+function subset(d::DataSet{T}, inds) where T
     DataSet(getdata(d)[inds])
 end
 ################################################################################
@@ -309,14 +309,17 @@ function metida_table_(obj::DataSet{RD}; order = nothing, results = nothing, ids
     mt2 = metida_table_((obj[:, c] for c in ressetl)...; names = ressetl)
     merge(mt1, mt2)
 end
-function metida_table(obj::DataSet{RD}; order = nothing, results = nothing, ids = nothing) where RD <: AbstractIDResult
-    metida_table(metida_table_(obj; order = order, results = results, ids = ids))
+function metida_table(obj::DataSet{RD}; kwargs...) where RD <: AbstractIDResult
+    metida_table(metida_table_(obj; kwargs...))
 end
 ################################################################################
 # TypedTables.jl interface
 
-function TypedTables.Table(obj::DataSet{RD}; order = nothing, results = nothing, ids = nothing) where RD <: AbstractIDResult
-    TypedTables.Table(metida_table_(obj; order = order, results = results, ids = ids))
+function TypedTables.Table(obj::AbstractDataSet; kwargs...)
+    TypedTables.Table(metida_table_(obj; kwargs...))
+end
+function TypedTables.Table(obj::MetidaTable)
+    TypedTables.Table(obj.table)
 end
 
 

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -95,7 +95,6 @@ using Test, Tables, TypedTables, CSV
     mt = MetidaBase.metida_table(exrsds)
     mt = MetidaBase.metida_table(exrsds; results = :r1, ids = :a)
     Table(exrsds; results = :r1, ids = [:a, :b])
-    #Table(exrsds)
 
     v1 = [1,2,-6,missing,NaN]
     itr1 = MetidaBase.skipnanormissing(v1)