From 418402f616ca50c4f9bc6150cc7da559e4d21342 Mon Sep 17 00:00:00 2001 From: "Anthony D. Blaom" Date: Wed, 24 Jan 2024 10:44:37 +1300 Subject: [PATCH 1/4] update docs re Warmup control --- docs/src/controlling_iterative_models.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/src/controlling_iterative_models.md b/docs/src/controlling_iterative_models.md index a2d43a1d0..77924219d 100644 --- a/docs/src/controlling_iterative_models.md +++ b/docs/src/controlling_iterative_models.md @@ -103,6 +103,7 @@ control | description [`GL`](@ref EarlyStopping.GL)`(alpha=2.0)` | † Stop after the "generalization loss (GL)" exceeds `alpha` | yes [`PQ`](@ref EarlyStopping.PQ)`(alpha=0.75, k=5)` | † Stop after "progress-modified GL" exceeds `alpha` | yes [`Patience`](@ref EarlyStopping.Patience)`(n=5)` | † Stop after `n` consecutive loss increases | yes +[`Warmup`](@ref EarlyStopping.Warmup)`(c; n=1)` | Wait for `n` loss updates before checking criteria `c` | no [`Info`](@ref IterationControl.Info)`(f=identity)` | Log to `Info` the value of `f(mach)`, where `mach` is current machine | no [`Warn`](@ref IterationControl.Warn)`(predicate; f="")` | Log to `Warn` the value of `f` or `f(mach)`, if `predicate(mach)` holds | no [`Error`](@ref IterationControl.Error)`(predicate; f="")` | Log to `Error` the value of `f` or `f(mach)`, if `predicate(mach)` holds and then stop | yes From 7965ca774e8af6634c42049fde6dacbe8375b9ca Mon Sep 17 00:00:00 2001 From: Antonello Lobianco Date: Sat, 27 Jan 2024 09:05:32 +0100 Subject: [PATCH 2/4] Update list_of_supported_models for betaml --- docs/src/list_of_supported_models.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/list_of_supported_models.md b/docs/src/list_of_supported_models.md index 04d02817d..701dc39be 100644 --- a/docs/src/list_of_supported_models.md +++ b/docs/src/list_of_supported_models.md @@ -30,7 +30,7 @@ independent assessment. | Package | Interface Pkg | Models | Maturity | Note | ------- | ------------- | ------ | -------- | ---- -[BetaML.jl](https://github.com/sylvaticus/BetaML.jl) | - | DecisionTreeClassifier, RandomForestClassifier, NeuralNetworkClassifier, LinearPerceptron, KernelPerceptron, Pegasos, DecisionTreeRegressor, RandomForestRegressor, NeuralNetworkRegressor, MultitargetNeuralNetworkRegressor, GaussianMixtureRegressor, MultitargetGaussianMixtureRegressor, KMeans, KMedoids, GaussianMixtureClusterer, SimpleImputer, GaussianMixtureImputer, RandomForestImputer, GeneralImputer | medium | +[BetaML.jl](https://github.com/sylvaticus/BetaML.jl) | - | DecisionTreeClassifier, RandomForestClassifier, NeuralNetworkClassifier, PerceptronClassifier, KernelPerceptronClassifier, PegasosClassifier, DecisionTreeRegressor, RandomForestRegressor, NeuralNetworkRegressor, MultitargetNeuralNetworkRegressor, GaussianMixtureRegressor, MultitargetGaussianMixtureRegressor, KMeansClusterer, KMedoidsClusterer, GaussianMixtureClusterer, SimpleImputer, GaussianMixtureImputer, RandomForestImputer, GeneralImputer, AutoEncoder | medium | [CatBoost.jl](https://github.com/JuliaAI/CatBoost.jl) | - | CatBoostRegressor, CatBoostClassifier | high | [Clustering.jl](https://github.com/JuliaStats/Clustering.jl) | [MLJClusteringInterface.jl](https://github.com/JuliaAI/MLJClusteringInterface.jl) | KMeans, KMedoids, DBSCAN, HierarchicalClustering | high² | [DecisionTree.jl](https://github.com/bensadeghi/DecisionTree.jl) | [MLJDecisionTreeInterface.jl](https://github.com/JuliaAI/MLJDecisionTreeInterface.jl) | DecisionTreeClassifier, DecisionTreeRegressor, AdaBoostStumpClassifier, RandomForestClassifier, RandomForestRegressor | high | From 36c56b0121a08d0ed4da70564630a9c895cc8e30 Mon Sep 17 00:00:00 2001 From: Antonello Lobianco Date: Sat, 27 Jan 2024 09:15:43 +0100 Subject: [PATCH 3/4] Update ModelDescriptors.toml for BetaML models --- docs/ModelDescriptors.toml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/ModelDescriptors.toml b/docs/ModelDescriptors.toml index 2f06d12dc..c2027768a 100644 --- a/docs/ModelDescriptors.toml +++ b/docs/ModelDescriptors.toml @@ -7,7 +7,7 @@ AdaBoostRegressor_MLJScikitLearnInterface = ["regression"] AdaBoostStumpClassifier_DecisionTree = ["classification"] AffinityPropagation_MLJScikitLearnInterface = ["clustering"] AgglomerativeClustering_MLJScikitLearnInterface = ["clustering", "static_models"] -AutoEncoderMLJ_BetaML = ["dimension_reduction"] +AutoEncoder_BetaML = ["dimension_reduction"] BM25Transformer_MLJText = ["encoders", "text_analysis"] BaggingClassifier_MLJScikitLearnInterface = ["classification", "ensemble_models"] BaggingRegressor_MLJScikitLearnInterface = ["regression", "ensemble_models"] @@ -90,11 +90,11 @@ ImageClassifier_MLJFlux = ["classification", "image_processing", "iterative_mode INNEDetector_OutlierDetectionPython = ["outlier_detection"] InteractionTransformer_MLJModels = ["static_models"] KDEDetector_OutlierDetectionPython = ["outlier_detection"] -KMeans_BetaML = ["clustering"] +KMeansClusterer_BetaML = ["clustering"] KMeans_Clustering = ["clustering", "dimension_reduction", ] KMeans_ParallelKMeans = ["clustering", "dimension_reduction", ] KMeans_MLJScikitLearnInterface = ["clustering", "dimension_reduction", ] -KMedoids_BetaML = ["clustering"] +KMedoidsClusterer_BetaML = ["clustering"] KMedoids_Clustering = ["clustering", "dimension_reduction", ] KNNClassifier_NearestNeighborModels = ["classification"] KNNDetector_OutlierDetectionNeighbors = ["outlier_detection"] @@ -104,7 +104,7 @@ KNeighborsClassifier_MLJScikitLearnInterface = ["classification"] KNeighborsRegressor_MLJScikitLearnInterface = ["regression"] KPLSRegressor_PartialLeastSquaresRegressor = ["regression"] KernelPCA_MultivariateStats = ["dimension_reduction", ] -KernelPerceptron_BetaML = ["classification"] +KernelPerceptronClassifier_BetaML = ["classification"] LADRegressor_MLJLinearModels = ["regression"] LDA_MultivariateStats = ["classification", "dimension_reduction", ] LGBMClassifier_LightGBM = ["classification", "ensemble_models", "iterative_models"] @@ -124,7 +124,7 @@ LassoRegressor_MLJLinearModels = ["regression"] LassoRegressor_MLJScikitLearnInterface = ["regression"] LinearBinaryClassifier_GLM = ["classification"] LinearCountRegressor_GLM = ["regression"] -LinearPerceptron_BetaML = ["classification"] +LinearPerceptronClassifier_BetaML = ["classification"] LinearRegressor_GLM = ["regression"] LinearRegressor_MLJLinearModels = ["regression"] LinearRegressor_MultivariateStats = ["regression"] @@ -170,7 +170,7 @@ PLSRegressor_PartialLeastSquaresRegressor = ["regression"] PPCA_MultivariateStats = ["dimension_reduction"] PassiveAggressiveClassifier_MLJScikitLearnInterface = ["classification"] PassiveAggressiveRegressor_MLJScikitLearnInterface = ["regression"] -Pegasos_BetaML = ["classification"] +PegasosClassifier_BetaML = ["classification"] PerceptronClassifier_MLJScikitLearnInterface = ["classification"] ProbabilisticNuSVC_LIBSVM = ["classification"] ProbabilisticSGDClassifier_MLJScikitLearnInterface = ["classification"] From 24d5bf25ed66d1a474d6792f32d2c048c53f07fd Mon Sep 17 00:00:00 2001 From: "Anthony D. Blaom" Date: Tue, 30 Jan 2024 07:56:43 +1300 Subject: [PATCH 4/4] fix PerceptronClassifier (BetaML) in ModelDescriptors.toml --- docs/ModelDescriptors.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/ModelDescriptors.toml b/docs/ModelDescriptors.toml index c2027768a..9fb4a09e8 100644 --- a/docs/ModelDescriptors.toml +++ b/docs/ModelDescriptors.toml @@ -124,7 +124,6 @@ LassoRegressor_MLJLinearModels = ["regression"] LassoRegressor_MLJScikitLearnInterface = ["regression"] LinearBinaryClassifier_GLM = ["classification"] LinearCountRegressor_GLM = ["regression"] -LinearPerceptronClassifier_BetaML = ["classification"] LinearRegressor_GLM = ["regression"] LinearRegressor_MLJLinearModels = ["regression"] LinearRegressor_MultivariateStats = ["regression"] @@ -171,7 +170,8 @@ PPCA_MultivariateStats = ["dimension_reduction"] PassiveAggressiveClassifier_MLJScikitLearnInterface = ["classification"] PassiveAggressiveRegressor_MLJScikitLearnInterface = ["regression"] PegasosClassifier_BetaML = ["classification"] -PerceptronClassifier_MLJScikitLearnInterface = ["classification"] +PerceptronClassifier_BetaML = ["classification", "iterative_models"] +PerceptronClassifier_MLJScikitLearnInterface = ["classification", "iterative_models"] ProbabilisticNuSVC_LIBSVM = ["classification"] ProbabilisticSGDClassifier_MLJScikitLearnInterface = ["classification"] ProbabilisticSVC_LIBSVM = ["classification"]