Skip to content

Commit

Permalink
[MNT] Fix RDST CI failure and slow down (#2121)
Browse files Browse the repository at this point in the history
* Remove distance argument for RDST

* replace old to new random generator API, unfiformize dtypes

* fix visualization

* put back regressors on ignore list
  • Loading branch information
baraline authored Oct 5, 2024
1 parent 8b08497 commit 5ec4693
Show file tree
Hide file tree
Showing 7 changed files with 136 additions and 123 deletions.
6 changes: 0 additions & 6 deletions aeon/classification/shapelet_based/_rdst.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,6 @@ class RDSTClassifier(BaseClassifier):
If True, restricts the value of the shapelet dilation parameter to be prime
values. This can greatly speed-up the algorithm for long time series and/or
short shapelet lengths, possibly at the cost of some accuracy.
distance: str="manhattan"
Name of the distance function to be used. By default this is the
manhattan distance. Other distances from the aeon distance modules can be used.
estimator : BaseEstimator or None, default=None
Base estimator for the ensemble, can be supplied a sklearn `BaseEstimator`. If
`None` a default `RidgeClassifierCV` classifier is used with standard scaling.
Expand Down Expand Up @@ -147,7 +144,6 @@ def __init__(
threshold_percentiles=None,
alpha_similarity: float = 0.5,
use_prime_dilations: bool = False,
distance: str = "manhattan",
estimator=None,
save_transformed_data: bool = False,
class_weight=None,
Expand All @@ -160,7 +156,6 @@ def __init__(
self.threshold_percentiles = threshold_percentiles
self.alpha_similarity = alpha_similarity
self.use_prime_dilations = use_prime_dilations
self.distance = distance
self.estimator = estimator
self.save_transformed_data = save_transformed_data
self.class_weight = class_weight
Expand Down Expand Up @@ -203,7 +198,6 @@ def _fit(self, X, y):
use_prime_dilations=self.use_prime_dilations,
n_jobs=self.n_jobs,
random_state=self.random_state,
distance=self.distance,
)
if self.estimator is None:
self._estimator = make_pipeline(
Expand Down
2 changes: 2 additions & 0 deletions aeon/testing/testing_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@
EXCLUDE_ESTIMATORS = [
"SeriesSearch",
"QuerySearch",
"ClearSkyTransformer",
# See #2071
"RandomDilatedShapeletTransform",
"RDSTClassifier",
"RDSTRegressor",
"RISTRegressor",
]


Expand Down
Loading

0 comments on commit 5ec4693

Please sign in to comment.