Skip to content

Commit 172bff6

Browse files
lucifer4073lucifer4073
committed
Revert "Merge branch 'main' into seed"
This reverts commit 0756ccd, reversing changes made to 15947ef.
1 parent bfff6a2 commit 172bff6

File tree

12 files changed

+12
-63
lines changed

12 files changed

+12
-63
lines changed

‎aeon/clustering/_elastic_som.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
from aeon.clustering.base import BaseClusterer
88
from aeon.distances import get_alignment_path_function, pairwise_distance
9-
from aeon.utils.tags.enum_tags import AlgorithmType
109

1110
VALID_ELASTIC_SOM_METRICS = [
1211
"dtw",
@@ -149,7 +148,7 @@ class ElasticSOM(BaseClusterer):
149148

150149
_tags = {
151150
"capability:multivariate": True,
152-
"algorithm_type": AlgorithmType.DISTANCE.value,
151+
"algorithm_type": "distance",
153152
}
154153

155154
def __init__(

‎aeon/clustering/_k_means.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
from typing import Optional
44

5-
from aeon.utils.tags.enum_tags import AlgorithmType
6-
75
__maintainer__ = []
86

97
from typing import Callable, Union
@@ -155,7 +153,7 @@ class TimeSeriesKMeans(BaseClusterer):
155153

156154
_tags = {
157155
"capability:multivariate": True,
158-
"algorithm_type": AlgorithmType.DISTANCE.value,
156+
"algorithm_type": "distance",
159157
}
160158

161159
def __init__(

‎aeon/clustering/_k_medoids.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
from typing import Optional
44

5-
from aeon.utils.tags.enum_tags import AlgorithmType
6-
75
__maintainer__ = []
86

97
import warnings
@@ -148,7 +146,7 @@ class TimeSeriesKMedoids(BaseClusterer):
148146

149147
_tags = {
150148
"capability:multivariate": True,
151-
"algorithm_type": AlgorithmType.DISTANCE.value,
149+
"algorithm_type": "distance",
152150
}
153151

154152
def __init__(

‎aeon/clustering/_k_sc.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
from numpy.random import RandomState
77

88
from aeon.clustering import TimeSeriesKMeans
9-
from aeon.utils.tags.enum_tags import AlgorithmType
109

1110

1211
class KSpectralCentroid(TimeSeriesKMeans):
@@ -93,7 +92,7 @@ class KSpectralCentroid(TimeSeriesKMeans):
9392

9493
_tags = {
9594
"capability:multivariate": True,
96-
"algorithm_type": AlgorithmType.DISTANCE.value,
95+
"algorithm_type": "distance",
9796
}
9897

9998
def __init__(

‎aeon/clustering/_k_shape.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
from numpy.random import RandomState
77

88
from aeon.clustering.base import BaseClusterer
9-
from aeon.utils.tags.enum_tags import AlgorithmType
109

1110

1211
class TimeSeriesKShape(BaseClusterer):
@@ -71,7 +70,7 @@ class TimeSeriesKShape(BaseClusterer):
7170
_tags = {
7271
"capability:multivariate": True,
7372
"python_dependencies": "tslearn",
74-
"algorithm_type": AlgorithmType.DISTANCE.value,
73+
"algorithm_type": "distance",
7574
}
7675

7776
def __init__(

‎aeon/clustering/compose/_pipeline.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
from aeon.base._estimators.compose.collection_pipeline import BaseCollectionPipeline
88
from aeon.clustering import BaseClusterer
9-
from aeon.utils.tags.enum_tags import AlgorithmType
109

1110

1211
class ClustererPipeline(BaseCollectionPipeline, BaseClusterer):
@@ -76,10 +75,7 @@ class ClustererPipeline(BaseCollectionPipeline, BaseClusterer):
7675
"""
7776

7877
_tags = {
79-
"X_inner_type": [
80-
AlgorithmType.NP_LIST.value,
81-
AlgorithmType.NUMPY3D.value,
82-
],
78+
"X_inner_type": ["np-list", "numpy3D"],
8379
}
8480

8581
def __init__(self, transformers, clusterer, random_state=None):

‎aeon/clustering/deep_learning/base.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
from aeon.base._base import _clone_estimator
99
from aeon.clustering._k_means import TimeSeriesKMeans
1010
from aeon.clustering.base import BaseClusterer
11-
from aeon.utils.tags.enum_tags import AlgorithmType
1211

1312

1413
class BaseDeepClusterer(BaseClusterer):
@@ -30,9 +29,9 @@ class BaseDeepClusterer(BaseClusterer):
3029
"""
3130

3231
_tags = {
33-
"X_inner_type": AlgorithmType.NUMPY3D.value,
32+
"X_inner_type": "numpy3D",
3433
"capability:multivariate": True,
35-
"algorithm_type": AlgorithmType.DEEPLEARNING.value,
34+
"algorithm_type": "deeplearning",
3635
"non_deterministic": True,
3736
"cant_pickle": True,
3837
"python_dependencies": "tensorflow",

‎aeon/clustering/feature_based/_catch22.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
from aeon.base._base import _clone_estimator
1313
from aeon.clustering import BaseClusterer
1414
from aeon.transformations.collection.feature_based import Catch22
15-
from aeon.utils.tags.enum_tags import AlgorithmType
1615

1716

1817
class Catch22Clusterer(BaseClusterer):
@@ -93,14 +92,11 @@ class Catch22Clusterer(BaseClusterer):
9392
"""
9493

9594
_tags = {
96-
"X_inner_type": [
97-
AlgorithmType.NP_LIST.value,
98-
AlgorithmType.NUMPY3D.value,
99-
],
95+
"X_inner_type": ["np-list", "numpy3D"],
10096
"capability:multivariate": True,
10197
"capability:unequal_length": True,
10298
"capability:multithreading": True,
103-
"algorithm_type": AlgorithmType.FEATURE.value,
99+
"algorithm_type": "feature",
104100
}
105101

106102
def __init__(

‎aeon/clustering/feature_based/_summary.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
from aeon.base._base import _clone_estimator
1313
from aeon.clustering import BaseClusterer
1414
from aeon.transformations.collection.feature_based import SevenNumberSummary
15-
from aeon.utils.tags.enum_tags import AlgorithmType
1615

1716

1817
class SummaryClusterer(BaseClusterer):
@@ -65,7 +64,7 @@ class SummaryClusterer(BaseClusterer):
6564
_tags = {
6665
"capability:multivariate": True,
6766
"capability:multithreading": True,
68-
"algorithm_type": AlgorithmType.FEATURE.value,
67+
"algorithm_type": "feature",
6968
}
7069

7170
def __init__(

‎aeon/clustering/feature_based/_tsfresh.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
from aeon.base._base import _clone_estimator
1616
from aeon.clustering import BaseClusterer
1717
from aeon.transformations.collection.feature_based import TSFresh
18-
from aeon.utils.tags.enum_tags import AlgorithmType
1918

2019

2120
class TSFreshClusterer(BaseClusterer):
@@ -75,7 +74,7 @@ class TSFreshClusterer(BaseClusterer):
7574
_tags = {
7675
"capability:multivariate": True,
7776
"capability:multithreading": True,
78-
"algorithm_type": AlgorithmType.FEATURE.value,
77+
"algorithm_type": "feature",
7978
"python_dependencies": "tsfresh",
8079
}
8180

0 commit comments

Comments
 (0)