merge 2

MatthewMiddlehurst · MatthewMiddlehurst · commit 68a2ccbde30d · 2025-06-18T11:03:50.000+01:00
diff --git a/aeon/anomaly_detection/__init__.py b/aeon/anomaly_detection/__init__.py
@@ -3,3 +3,5 @@
 __all__ = [
     "BaseAnomalyDetector",
 ]
+
+from aeon.anomaly_detection.base import BaseAnomalyDetector
diff --git a/aeon/anomaly_detection/base.py b/aeon/anomaly_detection/base.py
@@ -46,7 +46,7 @@ def fit(self, X, y=None):
 
         Returns
         -------
-        BaseSeriesAnomalyDetector
+        BaseAnomalyDetector
             The fitted estimator, reference to self.
         """
         ...
diff --git a/aeon/utils/base/_identifier.py b/aeon/utils/base/_identifier.py
@@ -49,10 +49,10 @@ def get_identifier(estimator):
 
     if len(identifiers) > 1 and "estimator" in identifiers:
         identifiers.remove("estimator")
-    if len(identifiers) > 1 and "series-estimator" in identifiers:
-        identifiers.remove("series-estimator")
     if len(identifiers) > 1 and "collection-estimator" in identifiers:
         identifiers.remove("collection-estimator")
+    if len(identifiers) > 1 and "series-estimator" in identifiers:
+        identifiers.remove("series-estimator")
     if len(identifiers) > 1 and "transformer" in identifiers:
         identifiers.remove("transformer")
     if len(identifiers) > 1 and "anomaly-detector" in identifiers:

Original file line number	Diff line number	Diff line change
`@@ -3,3 +3,5 @@`
`3`	`3`	`__all__ = [`
`4`	`4`	`"BaseAnomalyDetector",`
`5`	`5`	`]`
	`6`	`+`
	`7`	`+from aeon.anomaly_detection.base import BaseAnomalyDetector`