|
1 | 1 | from abc import ABC, abstractmethod
|
2 | 2 | from typing import List, Type, Union, Tuple, Optional, Dict, Any
|
3 | 3 |
|
4 |
| -from fslite.fs.constants import ML_METHODS, UNIVARIATE_METHODS, MULTIVARIATE_METHODS |
5 |
| -from fslite.fs.core import FSDataFrame |
| 4 | +from fslite.fs.constants import FS_METHODS, get_fs_multivariate_methods, get_fs_ml_methods |
| 5 | +from fslite.fs.fdataframe import FSDataFrame |
6 | 6 | from fslite.fs.ml import MLCVModel
|
7 | 7 | from fslite.fs.multivariate import multivariate_filter
|
8 | 8 | from fslite.fs.univariate import univariate_filter
|
@@ -88,7 +88,7 @@ class FSUnivariate(FSMethod):
|
88 | 88 | kwargs (dict): Additional keyword arguments for the feature selection method.
|
89 | 89 | """
|
90 | 90 |
|
91 |
| - valid_methods = list(UNIVARIATE_METHODS.keys()) |
| 91 | + valid_methods = list(FS_METHODS.keys()) |
92 | 92 |
|
93 | 93 | def __init__(self, fs_method: str, **kwargs):
|
94 | 94 | """
|
@@ -161,7 +161,7 @@ class FSMultivariate(FSMethod):
|
161 | 161 | selected_features = fs_multivariate.select_features(fsdf)
|
162 | 162 | """
|
163 | 163 |
|
164 |
| - valid_methods = list(MULTIVARIATE_METHODS.keys()) |
| 164 | + valid_methods = list(get_fs_multivariate_methods()) |
165 | 165 |
|
166 | 166 | def __init__(self, fs_method: str, **kwargs):
|
167 | 167 | """
|
@@ -225,7 +225,7 @@ class FSMLMethod(FSMethod):
|
225 | 225 | kwargs (dict): Additional keyword arguments for the feature selection method.
|
226 | 226 | """
|
227 | 227 |
|
228 |
| - valid_methods = list(ML_METHODS.keys()) |
| 228 | + valid_methods = list(get_fs_ml_methods()) |
229 | 229 | _ml_model: MLCVModel = None
|
230 | 230 |
|
231 | 231 | def __init__(
|
|
0 commit comments