Add more supported metrics to MhaSelector and MultiMhaSelector

thieu1995 · Aug 7, 2023 · 8ff68a5 · 8ff68a5
1 parent a202714
commit 8ff68a5
Showing 1 changed file with 5 additions and 11 deletions.
diff --git a/mafese/wrapper/mha.py b/mafese/wrapper/mha.py
@@ -17,7 +17,7 @@
 from mafese.utils.mealpy_util import get_optimizer_by_name, get_all_optimizers, FeatureSelectionProblem, Optimizer
 from mafese.utils import transfer
 from mafese.utils.data_loader import Data
-from mafese.utils.evaluator import get_metrics
+from mafese.utils.evaluator import get_metrics, get_all_regression_metrics, get_all_classification_metrics
 from permetrics.regression import RegressionMetric
 from permetrics.classification import ClassificationMetric
 import plotly.express as px
@@ -102,11 +102,8 @@ class MhaSelector(Selector):
     SUPPORT = {
         "estimator": ["knn", "svm", "rf", "adaboost", "xgb", "tree", "ann"],
         "transfer_func": ["vstf_01", "vstf_02", "vstf_03", "vstf_04", "sstf_01", "sstf_02", "sstf_03", "sstf_04"],
-        "regression_objective": {"MAE": "min", "MSE": "min", "RMSE": "min", "MRE": "min", "MAPE": "min", "MASE": "min",
-                             "NSE": "max", "NNSE": "max", "WI": "max", "PCC": "max", "R2s": "max", "R2": "max", "AR2": "max",
-                             "CI": "max", "KGE": "max", "VAF": "max", "A10": "max", "A20": "max"},
-        "classification_objective": {"AS": "max", "PS": "max", "NPV": "max", "RS": "max", "F1S": "max", "F2S": "max",
-                             "FBS": "max", "SS": "max", "MCC": "max", "JSI": "max", "CKS": "max", "ROC-AUC": "max"},
+        "regression_objective": get_all_regression_metrics(),
+        "classification_objective": get_all_classification_metrics(),
         "optimizer": list(get_all_optimizers().keys())
     }
 
@@ -243,11 +240,8 @@ class MultiMhaSelector(Selector):
     SUPPORT = {
         "estimator": ["knn", "svm", "rf", "adaboost", "xgb", "tree", "ann"],
         "transfer_func": ["vstf_01", "vstf_02", "vstf_03", "vstf_04", "sstf_01", "sstf_02", "sstf_03", "sstf_04"],
-        "regression_objective": {"MAE": "min", "MSE": "min", "RMSE": "min", "MRE": "min", "MAPE": "min", "MASE": "min",
-                             "NSE": "max", "NNSE": "max", "WI": "max", "PCC": "max", "R2s": "max", "R2": "max", "AR2": "max",
-                             "CI": "max", "KGE": "max", "VAF": "max", "A10": "max", "A20": "max"},
-        "classification_objective": {"AS": "max", "PS": "max", "NPV": "max", "RS": "max", "F1S": "max", "F2S": "max",
-                             "FBS": "max", "SS": "max", "MCC": "max", "JSI": "max", "CKS": "max", "ROC-AUC": "max"},
+        "regression_objective": get_all_regression_metrics(),
+        "classification_objective": get_all_classification_metrics(),
         "optimizer": list(get_all_optimizers().keys())
     }