Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MNT] Clustering module 1.0 deprecations #2306

Merged
merged 35 commits into from
Nov 21, 2024
Merged
Show file tree
Hide file tree
Changes from 34 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
2306ebd
remove y from predict
TonyBagnall Oct 25, 2024
0035e49
Merge branch 'main' into ajb/base_clst
TonyBagnall Oct 25, 2024
2c4fd41
Merge branch 'main' into ajb/base_clst
TonyBagnall Oct 31, 2024
04c385b
remove score
TonyBagnall Oct 31, 2024
a346080
remove score, add fit_predict
TonyBagnall Oct 31, 2024
60615dd
remove score, add fit_predict
TonyBagnall Oct 31, 2024
aad00ef
removed score and n_clusters from base class
chrisholder Nov 1, 2024
bed81be
merged main
chrisholder Nov 4, 2024
24732d2
fit_predict
chrisholder Nov 4, 2024
78c67c8
clustering deprecations
chrisholder Nov 5, 2024
491117f
notebook
chrisholder Nov 5, 2024
e83387c
fixed predict proba
chrisholder Nov 6, 2024
30fbda9
fixed dnn tests
chrisholder Nov 6, 2024
3557ac4
fixed dnn tests
chrisholder Nov 6, 2024
2a5807d
fix notebook
chrisholder Nov 6, 2024
42e5a16
merge main
chrisholder Nov 6, 2024
3f80902
fixed
chrisholder Nov 6, 2024
63ed72d
Merge branch 'main' into ajb/base_clst
TonyBagnall Nov 12, 2024
4c2475f
Merge branch 'main' into ajb/base_clst
chrisholder Nov 15, 2024
a591c31
removed deep learner n_clusters and assert labels_ exists
chrisholder Nov 15, 2024
9ede1fc
Merge branch 'main' into cluster-deprecations
TonyBagnall Nov 16, 2024
2ee81ba
cont
chrisholder Nov 17, 2024
ebec4e6
fix dnns
chrisholder Nov 19, 2024
692849e
merge
chrisholder Nov 19, 2024
02fcee0
pipeline clusterer
chrisholder Nov 19, 2024
9104808
fix pipeline
chrisholder Nov 19, 2024
1c85487
revert
chrisholder Nov 19, 2024
c89d854
fix
chrisholder Nov 20, 2024
4c1e6d0
remove score from dnns
chrisholder Nov 20, 2024
6d68492
remove score from notebooks
chrisholder Nov 20, 2024
a56b4d4
remove score from remaining
chrisholder Nov 20, 2024
f6b0ffb
fix notebook
chrisholder Nov 20, 2024
c0bb4ce
merge updated based clst
chrisholder Nov 20, 2024
ae550a6
merged
chrisholder Nov 20, 2024
045edfa
fixed notebook
chrisholder Nov 21, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions aeon/clustering/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"TimeSeriesCLARANS",
"TimeSeriesKMeans",
"TimeSeriesKShape",
"TimeSeriesKShapes",
"TimeSeriesKernelKMeans",
"ElasticSOM",
"KSpectralCentroid",
Expand All @@ -21,7 +20,6 @@
from aeon.clustering._k_medoids import TimeSeriesKMedoids
from aeon.clustering._k_sc import KSpectralCentroid
from aeon.clustering._k_shape import TimeSeriesKShape
from aeon.clustering._k_shapes import TimeSeriesKShapes
from aeon.clustering._kernel_k_means import TimeSeriesKernelKMeans
from aeon.clustering.base import BaseClusterer
from aeon.clustering.dummy import DummyClusterer
12 changes: 0 additions & 12 deletions aeon/clustering/_k_means.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,20 +169,8 @@ def __init__(
averaging_method: Union[str, Callable[[np.ndarray], np.ndarray]] = "ba",
distance_params: Optional[dict] = None,
average_params: Optional[dict] = None,
init_algorithm: Optional[Union[str, np.ndarray]] = None,
):
self.init = init
self.init_algorithm = init_algorithm
if init_algorithm is not None:
import warnings

warnings.warn(
"The 'init_algorithm' parameter is deprecated and will be "
"removed in a future. Version Use 'init' instead.",
DeprecationWarning,
stacklevel=2,
)
self.init = self.init_algorithm
self.distance = distance
self.n_init = n_init
self.max_iter = max_iter
Expand Down
183 changes: 0 additions & 183 deletions aeon/clustering/_k_shapes.py

This file was deleted.

2 changes: 1 addition & 1 deletion examples/networks/deep_learning.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@
"\n",
"aefcn = AEFCNClusterer(\n",
" temporal_latent_space=False,\n",
" clustering_algorithm=\"kmeans\",\n",
" estimator=\"kmeans\",\n",
" n_epochs=10,\n",
")\n",
"\n",
Expand Down
Loading