Merge branch 'categoricalvalue'

alan-turing-institute · May 9, 2019 · 22242f7 · 22242f7
2 parents 9cf3096 + 4e517ff
commit 22242f7
Show file tree

Hide file tree

Showing 41 changed files with 1,024 additions and 1,685 deletions.
diff --git a/Metadata.toml b/Metadata.toml
@@ -23,7 +23,7 @@
 ":package_name" = "DecisionTree"
 ":name" = "DecisionTreeClassifier"
 ":is_probabilistic" = "`true`"
-":target_scitype_union" = "`Union{FiniteOrderedFactor, Multiclass}`"
+":target_scitype_union" = "`Union{Multiclass, OrderedFactor}`"
 ":input_scitype_union" = "`MLJBase.Continuous`"
 ":is_wrapper" = "`false`"
 
@@ -37,7 +37,7 @@
 ":package_name" = "ScikitLearn"
 ":name" = "SVMLClassifier"
 ":is_probabilistic" = "`false`"
-":target_scitype_union" = "`Union{FiniteOrderedFactor, Multiclass}`"
+":target_scitype_union" = "`Union{Multiclass, OrderedFactor}`"
 ":input_scitype_union" = "`MLJBase.Continuous`"
 ":is_wrapper" = "`false`"
 
@@ -51,7 +51,7 @@
 ":package_name" = "ScikitLearn"
 ":name" = "SVMNuClassifier"
 ":is_probabilistic" = "`false`"
-":target_scitype_union" = "`Union{FiniteOrderedFactor, Multiclass}`"
+":target_scitype_union" = "`Union{Multiclass, OrderedFactor}`"
 ":input_scitype_union" = "`MLJBase.Continuous`"
 ":is_wrapper" = "`false`"
 
@@ -79,7 +79,7 @@
 ":package_name" = "ScikitLearn"
 ":name" = "SVMClassifier"
 ":is_probabilistic" = "`false`"
-":target_scitype_union" = "`Union{FiniteOrderedFactor, Multiclass}`"
+":target_scitype_union" = "`Union{Multiclass, OrderedFactor}`"
 ":input_scitype_union" = "`MLJBase.Continuous`"
 ":is_wrapper" = "`false`"
 
@@ -205,7 +205,7 @@
 ":package_name" = "XGBoost"
 ":name" = "XGBoostClassifier"
 ":is_probabilistic" = "`true`"
-":target_scitype_union" = "`Union{FiniteOrderedFactor, Multiclass}`"
+":target_scitype_union" = "`Union{Multiclass, OrderedFactor}`"
 ":input_scitype_union" = "`MLJBase.Continuous`"
 ":is_wrapper" = "`false`"
 
@@ -219,7 +219,7 @@
 ":package_name" = "NaiveBayes"
 ":name" = "GaussianNBClassifier"
 ":is_probabilistic" = "`true`"
-":target_scitype_union" = "`Union{FiniteOrderedFactor, Multiclass}`"
+":target_scitype_union" = "`Union{Multiclass, OrderedFactor}`"
 ":input_scitype_union" = "`MLJBase.Continuous`"
 ":is_wrapper" = "`false`"
 
@@ -233,6 +233,6 @@
 ":package_name" = "NaiveBayes"
 ":name" = "MultinomialNBClassifier"
 ":is_probabilistic" = "`true`"
-":target_scitype_union" = "`Union{FiniteOrderedFactor, Multiclass}`"
+":target_scitype_union" = "`Union{Multiclass, OrderedFactor}`"
 ":input_scitype_union" = "`MLJBase.Count`"
 ":is_wrapper" = "`false`"
diff --git a/Project.toml b/Project.toml
@@ -25,9 +25,9 @@ StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
 Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
 
 [compat]
-MLJBase = "0.1.1"
-MLJModels = "0.1.1"
-julia = "1.0"
+MLJBase = "0.2.0"
+MLJModels = "0.2.0"
+julia = "1"
 
 [extras]
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"