Skip to content

Commit

Permalink
[MNT] Update similarity search with new base classes : Query Search (#…
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
baraline authored Jun 17, 2024
1 parent d37a77f commit 42e55c2
Show file tree
Hide file tree
Showing 21 changed files with 3,609 additions and 1,249 deletions.
4 changes: 2 additions & 2 deletions aeon/registry/_base_classes.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
from aeon.forecasting.model_selection._split import BaseSplitter
from aeon.regression.base import BaseRegressor
from aeon.segmentation.base import BaseSegmenter
from aeon.similarity_search.base import BaseSimiliaritySearch
from aeon.similarity_search.base import BaseSimilaritySearch
from aeon.transformations.base import BaseTransformer
from aeon.transformations.collection import BaseCollectionTransformer
from aeon.transformations.series import BaseSeriesTransformer
Expand All @@ -66,7 +66,7 @@
("series-estimator", BaseSeriesEstimator, "single series estimator"),
("series-transformer", BaseSeriesTransformer, "single series transformer"),
("splitter", BaseSplitter, "splitter"),
("similarity-search", BaseSimiliaritySearch, "similarity search"),
("similarity-search", BaseSimilaritySearch, "similarity search"),
("transformer", BaseTransformer, "transformer"),
]

Expand Down
1 change: 1 addition & 0 deletions aeon/registry/_tags.py
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,7 @@
"early_classifier",
"regressor",
"transformer",
"similarity-search",
"segmenter",
],
"bool",
Expand Down
15 changes: 4 additions & 11 deletions aeon/similarity_search/__init__.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
"""BaseSimilaritySearch."""
"""Similarity search module."""

__all__ = [
"BaseSimiliaritySearch",
"TopKSimilaritySearch",
"get_speedup_function_names",
]
__all__ = ["BaseSimilaritySearch", "QuerySearch"]

from aeon.similarity_search.base import (
BaseSimiliaritySearch,
get_speedup_function_names,
)
from aeon.similarity_search.top_k_similarity import TopKSimilaritySearch
from aeon.similarity_search.base import BaseSimilaritySearch
from aeon.similarity_search.query_search import QuerySearch
94 changes: 0 additions & 94 deletions aeon/similarity_search/_dummy.py

This file was deleted.

Loading

0 comments on commit 42e55c2

Please sign in to comment.