From 913ace952b761304949b29e21d1dd9d81d382203 Mon Sep 17 00:00:00 2001 From: CompatHelper Julia Date: Sat, 30 Sep 2023 00:21:56 +0000 Subject: [PATCH 1/6] CompatHelper: bump compat for MLJBase to 1, (keep existing compat) --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 962546c..9bd3908 100644 --- a/Project.toml +++ b/Project.toml @@ -20,7 +20,7 @@ Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c" AbstractTrees = "0.3, 0.4" CategoricalArrays = "0.10" InlineStrings = "1" -MLJBase = "0.21" +MLJBase = "0.21, 1" MLJLinearModels = "0.8, 0.9" MLJModelInterface = "1.4" OrderedCollections = "1.6.2" From 1be121b58d314afc2d610d2b7f0d47e37af2489b Mon Sep 17 00:00:00 2001 From: Rik Huijzer Date: Sun, 1 Oct 2023 15:53:34 +0200 Subject: [PATCH 2/6] Trigger CI From 81ee34dcdfdccaf8571cff9765132a4f86920c07 Mon Sep 17 00:00:00 2001 From: Rik Huijzer Date: Sun, 1 Oct 2023 15:59:41 +0200 Subject: [PATCH 3/6] Set version to 1.3.3 --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 9bd3908..c5a834d 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "SIRUS" uuid = "cdeec39e-fb35-4959-aadb-a1dd5dede958" authors = ["Rik Huijzer "] -version = "1.3.2" +version = "1.3.3" [deps] AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c" From a7328dcefd88ac24b13d2121b3a5116bd33dca2c Mon Sep 17 00:00:00 2001 From: Rik Huijzer Date: Sun, 1 Oct 2023 16:07:23 +0200 Subject: [PATCH 4/6] Force MLJBase to 1 in test compat --- test/Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Project.toml b/test/Project.toml index 7029a12..e3583f1 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -23,7 +23,7 @@ DataDeps = "0.7" DataFrames = "1.3" DecisionTree = "0.12" MLDatasets = "0.7" -MLJBase = "0.21" +MLJBase = "1" MLJDecisionTreeInterface = "0.4" MLJLinearModels = "0.9" MLJTestInterface = "0.2" From 583c882eecd44bf8e9140a8f866271b2720e1b0c Mon Sep 17 00:00:00 2001 From: Rik Huijzer Date: Sun, 1 Oct 2023 16:09:19 +0200 Subject: [PATCH 5/6] Allow both versions in docs --- docs/Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Project.toml b/docs/Project.toml index 4a41379..4c0bd3a 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -28,7 +28,7 @@ Documenter = "0.27" EvoTrees = "0.16" LiveServer = "1" MLJ = "0.19" -MLJBase = "0.21" +MLJBase = "0.21, 1" MLJDecisionTreeInterface = "0.4" PlutoStaticHTML = "6" PlutoUI = "0.7" From f046c27f70327c4e4eff87b91460b27a4d34f210 Mon Sep 17 00:00:00 2001 From: Rik Huijzer Date: Mon, 2 Oct 2023 09:36:09 +0200 Subject: [PATCH 6/6] Use measures from StatisticalMeasures --- test/Project.toml | 2 ++ test/preliminaries.jl | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/test/Project.toml b/test/Project.toml index e3583f1..b45ef2c 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -13,6 +13,7 @@ MLJTestInterface = "72560011-54dd-4dc2-94f3-c5de45b75ecd" MLJXGBoostInterface = "54119dfa-1dab-4055-a167-80440f4f7a91" Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" StableRNGs = "860ef19b-820b-49d6-a774-d7a799459cd3" +StatisticalMeasures = "a19d573c-0a75-4610-95b3-7071388c7541" Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" @@ -29,4 +30,5 @@ MLJLinearModels = "0.9" MLJTestInterface = "0.2" MLJXGBoostInterface = "0.3.8" StableRNGs = "1" +StatisticalMeasures = "0.1" Tables = "1.7" diff --git a/test/preliminaries.jl b/test/preliminaries.jl index b470533..f4dbbde 100644 --- a/test/preliminaries.jl +++ b/test/preliminaries.jl @@ -27,8 +27,6 @@ using MLJBase: CV, MLJBase, PerformanceEvaluation, - accuracy, - auc, evaluate, mode, fit!, @@ -36,7 +34,6 @@ using MLJBase: make_blobs, make_moons, make_regression, - rsq, predict using MLJDecisionTreeInterface: DecisionTreeClassifier, DecisionTreeRegressor using MLJLinearModels: LogisticClassifier, LinearRegressor, MultinomialClassifier @@ -44,6 +41,10 @@ using MLJTestInterface: MLJTestInterface using MLJXGBoostInterface: XGBoostClassifier, XGBoostRegressor using Random: shuffle, seed! using StableRNGs: StableRNG +using StatisticalMeasures: + accuracy, + auc, + rsq using SIRUS using Statistics: mean, var using Tables: Tables