Skip to content

Commit 6cb7d79

Browse files
Merge branch 'add-sklearn-clustering-example' of https://github.com/SalmanDeveloperz/aeon into add-sklearn-clustering-example
2 parents 145d64f + fb45d29 commit 6cb7d79

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

examples/clustering/sklearn_clustering_with_aeon_distances.ipynb

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@
125125
"# Visualize the clustering results\n",
126126
"plt.figure(figsize=(10, 6))\n",
127127
"for label in np.unique(labels):\n",
128+
<<<<<<< HEAD
128129
" cluster_data = X[labels == label] # Ensure correct slicing\n",
129130
" plt.plot(np.mean(cluster_data, axis=0), label=f\"Cluster {label}\", linewidth=2)\n",
130131
"\n",
@@ -134,6 +135,14 @@
134135
"plt.legend(loc=\"upper right\", fontsize=\"small\", ncol=2)\n",
135136
"plt.grid(True)\n",
136137
"plt.show()\n"
138+
=======
139+
" plt.plot(\n",
140+
" np.mean(X[labels == label], axis=0), label=f\"Cluster {label}\"\n",
141+
" ) # Fix indexing\n",
142+
"plt.title(\"Hierarchical Clustering with DTW Distance\")\n",
143+
"plt.legend()\n",
144+
"plt.show()"
145+
>>>>>>> fb45d2921c7f2c8ca58b871275140d14e02c6956
137146
]
138147
},
139148
{

0 commit comments

Comments
 (0)