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.

Sign up for GitHub

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

Jump to bottom

Add of Online Hierarchical Clustering #1218

Open
wants to merge 47 commits into
base: main
Choose a base branch
from
Open

Add of Online Hierarchical Clustering #1218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
ccc4864
add of Hierarchical Clustering
kchardon Apr 11, 2023
a61677b
Fixed issues
kchardon Apr 11, 2023
c2e15dd
Fix issues
kchardon Apr 11, 2023
3fcaca1
Fixed issues
kchardon Apr 11, 2023
d69c8e4
Fix issues
kchardon Apr 11, 2023
c44b32e
fixed trailing spaces
kchardon Apr 11, 2023
fd2d699
Fixed black and isort
kchardon Apr 11, 2023
6ccca75
reverting to the version passing the 'build river ubuntu'
kchardon Apr 11, 2023
2fd212d
fixed isort and black
kchardon Apr 11, 2023
914435d
Deleted the possibility to use all the data points
kchardon May 23, 2023
978d11c
Merge branch 'main' into main
kchardon Jun 5, 2023
ddefcba
correction for ruff hook
kchardon Jun 5, 2023
88ad11a
correction for ruff hook
kchardon Jun 5, 2023
09c7413
correction for ruff hook
kchardon Jun 5, 2023
ead6603
Modify Eucliean distance calculation using np.linalg.norm for better …
hoanganhngo610 Sep 11, 2023
7b92fca
Refactor elements related to the distance function.
hoanganhngo610 Sep 11, 2023
62c9419
Remove data types of attributes
hoanganhngo610 Sep 11, 2023
43f3722
Refactor inter subtree similarity function.
hoanganhngo610 Sep 11, 2023
d03de5c
Refactor intra subtree similarity function
hoanganhngo610 Sep 11, 2023
41b368c
Refactor leave finding function.
hoanganhngo610 Sep 11, 2023
0a98f0b
Refactor online top down (OTD) clustering function.
hoanganhngo610 Sep 11, 2023
edf3b3d
Refactor.
hoanganhngo610 Sep 11, 2023
13f1ea7
Cheng function name OTD to otd_clustering.
hoanganhngo610 Sep 11, 2023
4d3432f
Remove unnecessary comments.
hoanganhngo610 Sep 11, 2023
90a7858
Refactor description of the algorithm within Docstring.
hoanganhngo610 Sep 11, 2023
d00b186
Refactor tests in Docstring.
hoanganhngo610 Sep 11, 2023
d99ffbb
Refactor merge_nodes function.
hoanganhngo610 Sep 11, 2023
0cfe7c9
Refactor comments in merge_nodes
hoanganhngo610 Sep 11, 2023
d0f9f49
Rename predict_otd.
hoanganhngo610 Sep 11, 2023
bef5f29
Simplify comments.
hoanganhngo610 Sep 11, 2023
fd3f9b9
Modify __str__ printed output by adding "Printed Hierarchical Cluster…
hoanganhngo610 Sep 11, 2023
05f9cf4
Rename predict_otd.
hoanganhngo610 Sep 11, 2023
d8da76b
Split comments and rename printTree to print_tree.
hoanganhngo610 Sep 11, 2023
98eee88
Modify self.X to self.x_clusters.
hoanganhngo610 Sep 11, 2023
d3d9398
Lexical changes.
hoanganhngo610 Sep 11, 2023
f5cebe7
Remove unnecessary comments.
hoanganhngo610 Sep 11, 2023
9ef224d
Refactor Docstring
hoanganhngo610 Sep 12, 2023
aa597da
Refactor comment.
hoanganhngo610 Sep 12, 2023
66927cd
Make find_path() a static method.
hoanganhngo610 Sep 13, 2023
87cf7fd
Refactor Docstring.
hoanganhngo610 Sep 13, 2023
d12f243
Make print_tree static method.
hoanganhngo610 Sep 13, 2023
43884f0
Refactor code to account for failing tests.
hoanganhngo610 Sep 13, 2023
2a80d3c
Refactor distance function used in Hierarchical Clustering class.
hoanganhngo610 Sep 13, 2023
74055db
Delete euclidean_distance function (due to being unnecessary).
hoanganhngo610 Sep 13, 2023
c356828
Code refactoring to align with other algorithms available in River.
hoanganhngo610 Sep 13, 2023
851b710
Modify Docstring description for dist_func.
hoanganhngo610 Sep 13, 2023
14a09af
Delete least common ancestor finding function (since this function is…
hoanganhngo610 Sep 14, 2023
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
3 changes: 2 additions & 1 deletion docs/releases/unreleased.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Unreleased
## cluster
- Added `cluster.HierarchicalClustering`.

## bandit

Expand Down
11 changes: 10 additions & 1 deletion river/cluster/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,17 @@
from .clustream import CluStream
from .dbstream import DBSTREAM
from .denstream import DenStream
from .hcluster import HierarchicalClustering
from .k_means import KMeans
from .streamkmeans import STREAMKMeans
from .textclust import TextClust

__all__ = ["CluStream", "DBSTREAM", "DenStream", "KMeans", "STREAMKMeans", "TextClust"]
__all__ = [
"CluStream",
"DBSTREAM",
"DenStream",
"KMeans",
"STREAMKMeans",
"TextClust",
"HierarchicalClustering",
]
Loading
Loading