Merge pull request #23 from IBM/deprecation_fix

fix deprecations

Author: ppalmes

Project.toml

@@ -1,7 +1,7 @@
 name = "AMLPipelineBase"
 uuid = "e3c3008a-8869-4d53-9f34-c96f99c8a2b6"
 authors = ["Paulito Palmes <[email protected]>"]
-version = "0.1.12"
+version = "0.1.13"
 
 [deps]
 CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
@@ -18,11 +18,11 @@ StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
 [compat]
 CSV = "0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 0.10"
 DataFrames = "0.17, 0.18, 0.19, 0.20, 0.21, 0.22, 1.0, 1.1"
-DecisionTree = "0.8, 0.9, 0.10"
+DecisionTree = "0.8, 0.9, 0.10, 0.11, 0.12"
 IterTools = "1.1, 1.2, 1.3"
 MLBase = "0.6, 0.7, 0.8, 0.9"
 PooledArrays = "0.5, 1.0, 1.1"
-StatsBase = "0.25, 0.26, 0.27, 0.28, 0.29, 0.30, 0.31, 0.32, 0.33"
+StatsBase = "0.25, 0.26, 0.27, 0.28, 0.29, 0.30, 0.31, 0.32, 0.33, 0.34"
 julia = "1"
 
 [extras]

src/ensemble.jl

@@ -61,7 +61,7 @@ function VoteEnsemble(learners::Vector{<:Learner}; opt...)
    VoteEnsemble(Dict(:learners => learners, Dict(pairs(opt))...))
 end
 
-function VoteEnsemble(learners::Vararg{<:Learner})
+function VoteEnsemble(learners::Vararg{Learner})
    (eltype(learners) <: Learner) || throw(ArgumentError("argument setup error"))
    v=[x for x in learners] # convert tuples to vector
    VoteEnsemble(v)
@@ -158,7 +158,7 @@ function StackEnsemble(learners::Vector{<:Learner}; opt...)
    StackEnsemble(Dict(:learners => learners, Dict(pairs(opt))...))
 end
 
-function StackEnsemble(learners::Vararg{<:Learner})
+function StackEnsemble(learners::Vararg{Learner})
    (eltype(learners) <: Learner) || throw(ArgumentError("argument setup error"))
    v=[x for x in learners] # convert tuples to vector
    StackEnsemble(v)
@@ -341,7 +341,7 @@ function BestLearner(learners::Vector{<:Learner}; opt...)
    BestLearner(Dict(:learners => learners, Dict(pairs(opt))...))
 end
 
-function BestLearner(learners::Vararg{<:Learner})
+function BestLearner(learners::Vararg{Learner})
    (eltype(learners) <: Learner) || throw(ArgumentError("argument setup error"))
    v=[x for x in learners] # convert tuples to vector
    BestLearner(v)

src/pipelines.jl

@@ -61,7 +61,7 @@ end
 
 Helper function for Pipeline structure.
 """
-function Pipeline(machs::Vararg{<:Machine})
+function Pipeline(machs::Vararg{Machine})
    (eltype(machs) <: Machine) || throw(ArgumentError("argument setup error"))
    v=[x for x in machs] # convert tuples to vector
    combo = Pipeline(v)
@@ -150,7 +150,7 @@ function ComboPipeline(machs::Vector{<:Machine};opt...)
    ComboPipeline(Dict(:machines=>machs,:machine_args=>Dict(pairs(opt))))
 end
 
-function ComboPipeline(machs::Vararg{<:Machine})
+function ComboPipeline(machs::Vararg{Machine})
    (eltype(machs) <: Machine) || throw(ArgumentError("argument setup error"))
    v=[eval(x) for x in machs] # convert tuples to vector
    combo = ComboPipeline(v)