Merge pull request #184 from torlarse/bug_map_precomputed

Enable using precomputed distance matrices for clustering.
scikit-tda · Nov 25, 2019 · 4c52847 · 4c52847
2 parents 0711d80 + 2ccce2d
commit 4c52847
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/kmapper/kmapper.py b/kmapper/kmapper.py
@@ -500,17 +500,19 @@ def map(
         # we consider clustering or skipping it.
         cluster_params = clusterer.get_params()
 
-        min_cluster_samples = cluster_params.get(
-            "n_clusters",
-            cluster_params.get(
-                "min_cluster_size", cluster_params.get("min_samples", 1)
-            ),
-        )
+        if precomputed:
+            min_cluster_samples = 2
+        else:
+            min_cluster_samples = cluster_params.get(
+                "n_clusters",
+                cluster_params.get(
+                    "min_cluster_size", cluster_params.get("min_samples", 1)
+                ),
+            )
 
         if self.verbose > 1:
             print(
-                "Minimal points in hypercube before clustering: %d"
-                % (min_cluster_samples)
+                "Minimal points in hypercube before clustering: {}".format(min_cluster_samples)
             )
 
         # Subdivide the projected data X in intervals/hypercubes with overlap