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

[ENH] Implement Proximity Tree classifier using aeon distances #1566

Merged
merged 40 commits into from
Jun 27, 2024
Merged
Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
cf7a2c4
Yet to be wrapped by numba
itsdivya1309 May 24, 2024
8178f07
Added gini scores
itsdivya1309 May 28, 2024
c352221
Initial logic for tree
itsdivya1309 May 30, 2024
2d35c62
get best splitter
itsdivya1309 May 31, 2024
48013f0
Minor typo
itsdivya1309 May 31, 2024
d0b055b
build_tree method implemented
itsdivya1309 Jun 4, 2024
c242c8d
predict method
itsdivya1309 Jun 4, 2024
d9848b3
Completed the proximity tree
itsdivya1309 Jun 5, 2024
40663d7
random_state and staticmethod
itsdivya1309 Jun 6, 2024
6c7ccd2
predict and predict_proba
itsdivya1309 Jun 7, 2024
e9e9982
tests for gini and gini_gain
itsdivya1309 Jun 10, 2024
3ff6543
Merge branch 'aeon-toolkit:main' into proximity_forest
itsdivya1309 Jun 10, 2024
52fe6bc
test parameter value
itsdivya1309 Jun 12, 2024
1d76c34
Merge branch 'aeon-toolkit:main' into proximity_forest
itsdivya1309 Jun 13, 2024
2fe8bd6
Fixing random state
itsdivya1309 Jun 14, 2024
dbf5327
Merge branch 'aeon-toolkit:main' into proximity_forest
itsdivya1309 Jun 14, 2024
a7862d9
Fix recursion base case
itsdivya1309 Jun 14, 2024
2f5cfd8
Completed API
itsdivya1309 Jun 15, 2024
0a87290
Completed API
itsdivya1309 Jun 15, 2024
f987e07
Test case pass
itsdivya1309 Jun 16, 2024
71dead7
Merge branch 'aeon-toolkit:main' into proximity_forest
itsdivya1309 Jun 16, 2024
60de487
Merge branch 'aeon-toolkit:main' into proximity_forest
itsdivya1309 Jun 17, 2024
19f2579
Merge branch 'aeon-toolkit:main' into proximity_forest
itsdivya1309 Jun 17, 2024
bdbf624
Improve API
itsdivya1309 Jun 18, 2024
e0b005f
Minor corrections
itsdivya1309 Jun 19, 2024
9cf0683
Test for accuracy and pytest fixture
itsdivya1309 Jun 19, 2024
0c7dff5
Merge branch 'aeon-toolkit:main' into proximity_forest
itsdivya1309 Jun 19, 2024
55ed384
Merge branch 'aeon-toolkit:main' into proximity_forest
itsdivya1309 Jun 19, 2024
7f53362
Improve API and code cov
itsdivya1309 Jun 19, 2024
156368e
Merge branch 'aeon-toolkit:main' into proximity_forest
itsdivya1309 Jun 21, 2024
d148748
Comment at the top of the file
itsdivya1309 Jun 21, 2024
67f9284
Capability to handle 3d arrays
itsdivya1309 Jun 24, 2024
b5e9fed
Pull from origin
itsdivya1309 Jun 24, 2024
2656017
Merge branch 'aeon-toolkit:main' into proximity_forest
itsdivya1309 Jun 24, 2024
234a81c
Capability to handle 3d arrays
itsdivya1309 Jun 24, 2024
3133d19
Merge branch 'aeon-toolkit:main' into proximity_forest
itsdivya1309 Jun 25, 2024
ba76b54
Added API Reference
itsdivya1309 Jun 25, 2024
354b358
Merge branch 'aeon-toolkit:main' into proximity_forest
itsdivya1309 Jun 25, 2024
05eca4c
Merge branch 'aeon-toolkit:main' into proximity_forest
itsdivya1309 Jun 26, 2024
b0bc21b
Merge branch 'main' into proximity_forest
MatthewMiddlehurst Jun 26, 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
6 changes: 2 additions & 4 deletions aeon/classification/distance_based/__init__.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
"""Distance based time series classifiers."""

__all__ = [
"ElasticEnsemble",
"KNeighborsTimeSeriesClassifier",
]
__all__ = ["ElasticEnsemble", "KNeighborsTimeSeriesClassifier", "ProximityTree"]

from aeon.classification.distance_based._elastic_ensemble import ElasticEnsemble
from aeon.classification.distance_based._proximity_tree import ProximityTree
from aeon.classification.distance_based._time_series_neighbors import (
KNeighborsTimeSeriesClassifier,
)
Loading
Loading