Skip to content

Commit 42e55c2

Browse files
authored
[MNT] Update similarity search with new base classes : Query Search (#1508)
* Add query search module and base classes * Add Unequal length support and fix tests * Update similarity_search.rst Fix api doc * Update docstrings and rename q to X * Update test to account for parameter name change * Update test * Fix unequal length mask wrong condition * Remove BaseSimilaritySearch and update tests/notebook * Update test and registry * Fix test lookup * Fix tags * Add back BaseSimilaritySearch * Refactor query search class * update api reference * fix typo in test adapted from old dummy * Fix test fail due to floating point error without numba
1 parent d37a77f commit 42e55c2

21 files changed

+3609
-1249
lines changed

aeon/registry/_base_classes.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
from aeon.forecasting.model_selection._split import BaseSplitter
4747
from aeon.regression.base import BaseRegressor
4848
from aeon.segmentation.base import BaseSegmenter
49-
from aeon.similarity_search.base import BaseSimiliaritySearch
49+
from aeon.similarity_search.base import BaseSimilaritySearch
5050
from aeon.transformations.base import BaseTransformer
5151
from aeon.transformations.collection import BaseCollectionTransformer
5252
from aeon.transformations.series import BaseSeriesTransformer
@@ -66,7 +66,7 @@
6666
("series-estimator", BaseSeriesEstimator, "single series estimator"),
6767
("series-transformer", BaseSeriesTransformer, "single series transformer"),
6868
("splitter", BaseSplitter, "splitter"),
69-
("similarity-search", BaseSimiliaritySearch, "similarity search"),
69+
("similarity-search", BaseSimilaritySearch, "similarity search"),
7070
("transformer", BaseTransformer, "transformer"),
7171
]
7272

aeon/registry/_tags.py

+1
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,7 @@
246246
"early_classifier",
247247
"regressor",
248248
"transformer",
249+
"similarity-search",
249250
"segmenter",
250251
],
251252
"bool",

aeon/similarity_search/__init__.py

+4-11
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
1-
"""BaseSimilaritySearch."""
1+
"""Similarity search module."""
22

3-
__all__ = [
4-
"BaseSimiliaritySearch",
5-
"TopKSimilaritySearch",
6-
"get_speedup_function_names",
7-
]
3+
__all__ = ["BaseSimilaritySearch", "QuerySearch"]
84

9-
from aeon.similarity_search.base import (
10-
BaseSimiliaritySearch,
11-
get_speedup_function_names,
12-
)
13-
from aeon.similarity_search.top_k_similarity import TopKSimilaritySearch
5+
from aeon.similarity_search.base import BaseSimilaritySearch
6+
from aeon.similarity_search.query_search import QuerySearch

aeon/similarity_search/_dummy.py

-94
This file was deleted.

0 commit comments

Comments
 (0)