@@ -154,12 +154,10 @@ def assert_membership_vectors(cu_vecs, sk_vecs):
154154@pytest .mark .parametrize ("cluster_selection_epsilon" , [0.0 ])
155155@pytest .mark .parametrize ("max_cluster_size" , [0 ])
156156@pytest .mark .parametrize ("cluster_selection_method" , ["eom" , "leaf" ])
157- @pytest .mark .parametrize ("connectivity" , ["knn" ])
158157def test_hdbscan_blobs (
159158 nrows ,
160159 ncols ,
161160 nclusters ,
162- connectivity ,
163161 cluster_selection_epsilon ,
164162 cluster_selection_method ,
165163 allow_single_cluster ,
@@ -225,10 +223,8 @@ def test_hdbscan_blobs(
225223)
226224@pytest .mark .parametrize ("allow_single_cluster" , [True , False ])
227225@pytest .mark .parametrize ("cluster_selection_method" , ["eom" , "leaf" ])
228- @pytest .mark .parametrize ("connectivity" , ["knn" ])
229226def test_hdbscan_sklearn_datasets (
230227 supervised_learning_dataset ,
231- connectivity ,
232228 cluster_selection_epsilon ,
233229 cluster_selection_method ,
234230 min_samples_cluster_size_bounds ,
@@ -289,10 +285,8 @@ def test_hdbscan_sklearn_datasets(
289285@pytest .mark .parametrize ("max_cluster_size" , [0 ])
290286@pytest .mark .parametrize ("allow_single_cluster" , [True , False ])
291287@pytest .mark .parametrize ("cluster_selection_method" , ["eom" , "leaf" ])
292- @pytest .mark .parametrize ("connectivity" , ["knn" ])
293288def test_hdbscan_sklearn_extract_clusters (
294289 supervised_learning_dataset ,
295- connectivity ,
296290 cluster_selection_epsilon ,
297291 cluster_selection_method ,
298292 min_samples ,
@@ -333,11 +327,9 @@ def test_hdbscan_sklearn_extract_clusters(
333327@pytest .mark .parametrize ("allow_single_cluster" , [True , False ])
334328@pytest .mark .parametrize ("max_cluster_size" , [0 ])
335329@pytest .mark .parametrize ("cluster_selection_method" , ["eom" ])
336- @pytest .mark .parametrize ("connectivity" , ["knn" ])
337330def test_hdbscan_cluster_patterns (
338331 dataset ,
339332 nrows ,
340- connectivity ,
341333 cluster_selection_epsilon ,
342334 cluster_selection_method ,
343335 min_cluster_size ,
@@ -396,11 +388,9 @@ def test_hdbscan_cluster_patterns(
396388@pytest .mark .parametrize ("allow_single_cluster" , [True , False ])
397389@pytest .mark .parametrize ("max_cluster_size" , [0 ])
398390@pytest .mark .parametrize ("cluster_selection_method" , ["eom" , "leaf" ])
399- @pytest .mark .parametrize ("connectivity" , ["knn" ])
400391def test_hdbscan_cluster_patterns_extract_clusters (
401392 dataset ,
402393 nrows ,
403- connectivity ,
404394 cluster_selection_epsilon ,
405395 cluster_selection_method ,
406396 min_cluster_size ,
@@ -589,7 +579,6 @@ def test_all_points_membership_vectors_blobs(
589579@pytest .mark .parametrize ("allow_single_cluster" , [True , False ])
590580@pytest .mark .parametrize ("max_cluster_size" , [0 ])
591581@pytest .mark .parametrize ("cluster_selection_method" , ["eom" , "leaf" ])
592- @pytest .mark .parametrize ("connectivity" , ["knn" ])
593582@pytest .mark .parametrize ("batch_size" , [128 , 1000 ])
594583def test_all_points_membership_vectors_moons (
595584 nrows ,
@@ -599,7 +588,6 @@ def test_all_points_membership_vectors_moons(
599588 min_cluster_size ,
600589 allow_single_cluster ,
601590 max_cluster_size ,
602- connectivity ,
603591 batch_size ,
604592):
605593
@@ -646,7 +634,6 @@ def test_all_points_membership_vectors_moons(
646634@pytest .mark .parametrize ("allow_single_cluster" , [True , False ])
647635@pytest .mark .parametrize ("max_cluster_size" , [0 ])
648636@pytest .mark .parametrize ("cluster_selection_method" , ["eom" , "leaf" ])
649- @pytest .mark .parametrize ("connectivity" , ["knn" ])
650637@pytest .mark .parametrize ("batch_size" , [128 , 1000 ])
651638def test_all_points_membership_vectors_circles (
652639 nrows ,
@@ -656,7 +643,6 @@ def test_all_points_membership_vectors_circles(
656643 min_cluster_size ,
657644 allow_single_cluster ,
658645 max_cluster_size ,
659- connectivity ,
660646 batch_size ,
661647):
662648 X , y = datasets .make_circles (
@@ -780,7 +766,6 @@ def test_approximate_predict_blobs(
780766@pytest .mark .parametrize ("allow_single_cluster" , [True , False ])
781767@pytest .mark .parametrize ("max_cluster_size" , [0 ])
782768@pytest .mark .parametrize ("cluster_selection_method" , ["eom" , "leaf" ])
783- @pytest .mark .parametrize ("connectivity" , ["knn" ])
784769def test_approximate_predict_moons (
785770 nrows ,
786771 n_points_to_predict ,
@@ -790,7 +775,6 @@ def test_approximate_predict_moons(
790775 allow_single_cluster ,
791776 max_cluster_size ,
792777 cluster_selection_method ,
793- connectivity ,
794778):
795779
796780 X , y = datasets .make_moons (
@@ -845,7 +829,6 @@ def test_approximate_predict_moons(
845829@pytest .mark .parametrize ("allow_single_cluster" , [True , False ])
846830@pytest .mark .parametrize ("max_cluster_size" , [0 ])
847831@pytest .mark .parametrize ("cluster_selection_method" , ["eom" , "leaf" ])
848- @pytest .mark .parametrize ("connectivity" , ["knn" ])
849832def test_approximate_predict_circles (
850833 nrows ,
851834 n_points_to_predict ,
@@ -855,7 +838,6 @@ def test_approximate_predict_circles(
855838 allow_single_cluster ,
856839 max_cluster_size ,
857840 cluster_selection_method ,
858- connectivity ,
859841):
860842 X , y = datasets .make_circles (
861843 n_samples = nrows + n_points_to_predict ,
@@ -911,7 +893,6 @@ def test_approximate_predict_circles(
911893@pytest .mark .parametrize ("allow_single_cluster" , [False ])
912894@pytest .mark .parametrize ("max_cluster_size" , [0 ])
913895@pytest .mark .parametrize ("cluster_selection_method" , ["eom" ])
914- @pytest .mark .parametrize ("connectivity" , ["knn" ])
915896def test_approximate_predict_digits (
916897 n_points_to_predict ,
917898 min_samples ,
@@ -920,7 +901,6 @@ def test_approximate_predict_digits(
920901 allow_single_cluster ,
921902 max_cluster_size ,
922903 cluster_selection_method ,
923- connectivity ,
924904):
925905 digits = datasets .load_digits ()
926906 X , y = digits .data , digits .target
@@ -1053,7 +1033,6 @@ def test_membership_vector_blobs(
10531033@pytest .mark .parametrize ("allow_single_cluster" , [True , False ])
10541034@pytest .mark .parametrize ("max_cluster_size" , [0 ])
10551035@pytest .mark .parametrize ("cluster_selection_method" , ["eom" , "leaf" ])
1056- @pytest .mark .parametrize ("connectivity" , ["knn" ])
10571036@pytest .mark .parametrize ("batch_size" , [16 ])
10581037def test_membership_vector_moons (
10591038 nrows ,
@@ -1064,7 +1043,6 @@ def test_membership_vector_moons(
10641043 min_cluster_size ,
10651044 allow_single_cluster ,
10661045 max_cluster_size ,
1067- connectivity ,
10681046 batch_size ,
10691047):
10701048
@@ -1117,7 +1095,6 @@ def test_membership_vector_moons(
11171095@pytest .mark .parametrize ("allow_single_cluster" , [True , False ])
11181096@pytest .mark .parametrize ("max_cluster_size" , [0 ])
11191097@pytest .mark .parametrize ("cluster_selection_method" , ["eom" , "leaf" ])
1120- @pytest .mark .parametrize ("connectivity" , ["knn" ])
11211098@pytest .mark .parametrize ("batch_size" , [16 ])
11221099def test_membership_vector_circles (
11231100 nrows ,
@@ -1128,7 +1105,6 @@ def test_membership_vector_circles(
11281105 min_cluster_size ,
11291106 allow_single_cluster ,
11301107 max_cluster_size ,
1131- connectivity ,
11321108 batch_size ,
11331109):
11341110 X , y = datasets .make_circles (
0 commit comments