fix crossreference

Author: CarloLucibello

docs/src/index.md

@@ -25,7 +25,7 @@ Pkg.add("MLDatasets")
 
 Datasets are grouped into different categories. Click on the links below for a full list of datasets available in each category.
 
-- [Graphs Datasets](@ref) - datasets with an underlying graph structure: Cora, PubMed, CiteSeer, ...
+- [Graph Datasets](@ref) - datasets with an underlying graph structure: Cora, PubMed, CiteSeer, ...
 - [Miscellaneuous Datasets](@ref) - datasets that do not fall into any of the other categories: Iris, BostonHousing, ...
 - [Text Datasets](@ref) - datasets for language models. 
 - [Vision Datasets](@ref) - vision related datasets such as MNIST, CIFAR10, CIFAR100, ... 

src/MLDatasets.jl

@@ -84,12 +84,12 @@ include("datasets/vision/cifar10.jl")
 export CIFAR10
 include("datasets/vision/cifar100_reader/CIFAR100Reader.jl")
 include("datasets/vision/cifar100.jl")
-export CIFAR100#
+export CIFAR100
 include("datasets/vision/svhn2.jl")
 export SVHN2
 
 ## Text
-#
+
 include("datasets/text/ptblm.jl")
 export PTBLM
 include("datasets/text/udenglish.jl")

src/containers/tabledataset.jl

@@ -12,14 +12,14 @@ struct TableDataset{T} <: AbstractDataContainer
     # TableDatasets must implement the Tables.jl interface
     function TableDataset{T}(table::T) where {T}
         Tables.istable(table) ||
-            throw(ArgumentError("TableDatasets must implement the Tabels.jl interface"))
+            throw(ArgumentError("The input must implement the Tables.jl interface"))
 
         new{T}(table)
     end
 end
 
 TableDataset(table::T) where {T} = TableDataset{T}(table)
-# TableDataset(path::AbstractString) = TableDataset(DataFrame(CSV.File(path)))
+TableDataset(path::AbstractString) = TableDataset(read_csv(path))
 
 # slow accesses based on Tables.jl
 _getobs_row(x, i) = first(Iterators.peel(Iterators.drop(x, i - 1)))
@@ -29,26 +29,32 @@ function _getobs_column(x, i)
 
     return NamedTuple{colnames}(rowvals)
 end
-function Base.getindex(dataset::TableDataset, i)
-    if Tables.rowaccess(dataset.table)
-        return _getobs_row(Tables.rows(dataset.table), i)
-    elseif Tables.columnaccess(dataset.table)
-        return _getobs_column(dataset.table, i)
+
+function getobs_table(table, i)
+    if Tables.rowaccess(table)
+        return _getobs_row(Tables.rows(table), i)
+    elseif Tables.columnaccess(table)
+        return _getobs_column(table, i)
     else
         error("The Tables.jl implementation used should have either rowaccess or columnaccess.")
     end
 end
-function Base.length(dataset::TableDataset)
-    if Tables.columnaccess(dataset.table)
-        return length(Tables.getcolumn(dataset.table, 1))
-    elseif Tables.rowaccess(dataset.table)
+
+function numobs_table(table)
+    if Tables.columnaccess(table)
+        return length(Tables.getcolumn(table, 1))
+    elseif Tables.rowaccess(table)
         # length might not be defined, but has to be for this to work.
-        return length(Tables.rows(dataset.table))
+        return length(Tables.rows(table))
     else
         error("The Tables.jl implementation used should have either rowaccess or columnaccess.")
     end
 end
 
+Base.getindex(dataset::TableDataset, i) = getobs_table(dataset.table, i)
+Base.length(dataset::TableDataset) = numobs_table(dataset.table)
+
+
 # fast access for DataFrame
 # Base.getindex(dataset::TableDataset{<:DataFrame}, i) = dataset.table[i, :]
 # Base.length(dataset::TableDataset{<:DataFrame}) = nrow(dataset.table)
@@ -60,6 +66,7 @@ end
 ## Tables.jl interface
 
 Tables.istable(::TableDataset) = true
+
 for fn in (:rowaccess, :rows, :columnaccess, :columns, :schema, :materializer)
     @eval Tables.$fn(dataset::TableDataset) = Tables.$fn(dataset.table)
 end