Skip to content

Commit f224410

Browse files
committed
affinity -> metric
1 parent 249696b commit f224410

File tree

2 files changed

+47
-14
lines changed

2 files changed

+47
-14
lines changed

ch10/ch10.ipynb

+24-7
Original file line numberDiff line numberDiff line change
@@ -1287,12 +1287,21 @@
12871287
}
12881288
],
12891289
"source": [
1290+
"from packaging import version\n",
12901291
"from sklearn.cluster import AgglomerativeClustering\n",
12911292
"\n",
12921293
"\n",
1293-
"ac = AgglomerativeClustering(n_clusters=3, \n",
1294-
" affinity='euclidean', \n",
1295-
" linkage='complete')\n",
1294+
"if version.parse(sklearn.__version__) > version.parse(\"1.2\"):\n",
1295+
" ac = AgglomerativeClustering(n_clusters=3,\n",
1296+
" metric=\"euclidean\",\n",
1297+
" linkage=\"complete\"\n",
1298+
" )\n",
1299+
"else:\n",
1300+
" ac = AgglomerativeClustering(n_clusters=3,\n",
1301+
" affinity=\"euclidean\",\n",
1302+
" linkage=\"complete\"\n",
1303+
" )\n",
1304+
"\n",
12961305
"labels = ac.fit_predict(X)\n",
12971306
"print(f'Cluster labels: {labels}')"
12981307
]
@@ -1311,9 +1320,17 @@
13111320
}
13121321
],
13131322
"source": [
1314-
"ac = AgglomerativeClustering(n_clusters=2, \n",
1315-
" affinity='euclidean', \n",
1316-
" linkage='complete')\n",
1323+
"if version.parse(sklearn.__version__) > version.parse(\"1.2\"):\n",
1324+
" ac = AgglomerativeClustering(n_clusters=2,\n",
1325+
" metric=\"euclidean\",\n",
1326+
" linkage=\"complete\"\n",
1327+
" )\n",
1328+
"else:\n",
1329+
" ac = AgglomerativeClustering(n_clusters=2,\n",
1330+
" affinity=\"euclidean\",\n",
1331+
" linkage=\"complete\"\n",
1332+
" )\n",
1333+
"\n",
13171334
"labels = ac.fit_predict(X)\n",
13181335
"print(f'Cluster labels: {labels}')"
13191336
]
@@ -1570,7 +1587,7 @@
15701587
"name": "python",
15711588
"nbconvert_exporter": "python",
15721589
"pygments_lexer": "ipython3",
1573-
"version": "3.9.6"
1590+
"version": "3.10.6"
15741591
}
15751592
},
15761593
"nbformat": 4,

ch10/ch10.py

+23-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# coding: utf-8
22

3-
3+
from packaging import version
44
import sys
55
from python_environment_check import check_packages
66
from sklearn.datasets import make_blobs
@@ -450,18 +450,34 @@
450450

451451

452452

453-
ac = AgglomerativeClustering(n_clusters=3,
454-
affinity='euclidean',
455-
linkage='complete')
453+
if version.parse(sklearn.__version__) > version.parse("1.2"):
454+
ac = AgglomerativeClustering(n_clusters=3,
455+
metric="euclidean",
456+
linkage="complete"
457+
)
458+
else:
459+
ac = AgglomerativeClustering(n_clusters=3,
460+
affinity="euclidean",
461+
linkage="complete"
462+
)
463+
456464
labels = ac.fit_predict(X)
457465
print(f'Cluster labels: {labels}')
458466

459467

460468

461469

462-
ac = AgglomerativeClustering(n_clusters=2,
463-
affinity='euclidean',
464-
linkage='complete')
470+
if version.parse(sklearn.__version__) > version.parse("1.2"):
471+
ac = AgglomerativeClustering(n_clusters=2,
472+
metric="euclidean",
473+
linkage="complete"
474+
)
475+
else:
476+
ac = AgglomerativeClustering(n_clusters=2,
477+
affinity="euclidean",
478+
linkage="complete"
479+
)
480+
465481
labels = ac.fit_predict(X)
466482
print(f'Cluster labels: {labels}')
467483

0 commit comments

Comments
 (0)