light fixes (#5)

* minor export changes

* int modif

Author: tlienart

Project.toml

@@ -1,7 +1,7 @@
 name = "MLJModelInterface"
 uuid = "e80e1ace-859a-464e-9ed9-23947d8ae3ea"
 authors = ["Thibaut Lienart and Anthony Blaom"]
-version = "0.1.0"
+version = "0.1.1"
 
 [deps]
 ScientificTypes = "321657f4-b219-11e9-178b-2701a2544e81"
@@ -19,5 +19,4 @@ Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Test", "Tables", "Distances", "CategoricalArrays", "InteractiveUtils",
-        "DataFrames"]
+test = ["Test", "Tables", "Distances", "CategoricalArrays", "InteractiveUtils", "DataFrames"]

src/MLJModelInterface.jl

@@ -15,13 +15,8 @@ export MLJType, Model, Supervised, Unsupervised,
        Probabilistic, Deterministic, Interval, Static,
        UnivariateFinite
 
-# reexport types from ScientificTypes
-export Scientific, Found, Unknown, Known, Finite, Infinite,
-       OrderedFactor, Multiclass, Count, Continuous, Textual,
-       Binary, ColorImage, GrayImage, Table
-
 # model constructor + metadata
-export @mlj_model, metadata_pkg, metadata_model, metadata_measure
+export @mlj_model, metadata_pkg, metadata_model
 
 # model api
 export fit, update, update_data, transform, inverse_transform,
@@ -41,6 +36,12 @@ export input_scitype, output_scitype, target_scitype,
 export matrix, int, classes, decoder, table,
        nrows, selectrows, selectcols, select
 
+# re-exports from ScientificTypes
+export Scientific, Found, Unknown, Known, Finite, Infinite,
+       OrderedFactor, Multiclass, Count, Continuous, Textual,
+       Binary, ColorImage, GrayImage, Image, Table
+export scitype, scitype_union, elscitype, nonmissing, trait
+
 # ------------------------------------------------------------------------
 # Mode trick
 

src/data_utils.jl

@@ -31,7 +31,7 @@ matrix(::LightInterface, ::Val{:table}, X; kw...) = errlight("matrix")
 # int
 
 """
-   int(x)
+   int(x; type=nothing)
 
 The positional integer of the `CategoricalString` or `CategoricalValue` `x`, in
 the ordering defined by the pool of `x`. The type of `int(x)` is the reference
@@ -61,9 +61,12 @@ Broadcasted versions of `int`.
 
 See also: [`decoder`](@ref).
 """
-int(x; kw...) = int(get_interface_mode(), x; kw...)
+function int(x; type::Union{Nothing,Type{T}}=nothing) where T <: Real
+    type === nothing && return int(get_interface_mode(), x)
+    return convert.(T, int(get_interface_mode(), x))
+end
 
-int(::LightInterface, x; kw...) = errlight("int")
+int(::LightInterface, x) = errlight("int")
 
 # ------------------------------------------------------------------------
 # classes
@@ -270,7 +273,7 @@ be of type `CategoricalElement` (see above) and the dictionary values specify
 the corresponding probabilities.
 """
 UnivariateFinite(d::AbstractDict) = UnivariateFinite(get_interface_mode(), d)
-UnivariateFinite(c::AbstractVector, p::AbstractVector) =
+UnivariateFinite(c::AbstractVector, p) =
     UnivariateFinite(get_interface_mode(), c, p)
 
 UnivariateFinite(::LightInterface, a...) = errlight("UnivariateFinite")

test/data_utils.jl

@@ -27,6 +27,9 @@ end
     x = categorical(['a','b','a'])
     @test int(x[1]) == 0x01
     @test int(x[2]) == 0x02
+    @test int(x[2]) isa UInt32
+    @test int(x[1], type=Int64) == 1
+    @test int(x[1], type=Int64) isa Int64
 end
 # ------------------------------------------------------------------------
 @testset "classes-light" begin