Cluster slection method pushed to condensed tree plots.

Author: lmcinnes

hdbscan/hdbscan_.py

@@ -918,7 +918,7 @@ def outlier_scores_(self):
     @property
     def condensed_tree_(self):
         if self._condensed_tree is not None:
-            return CondensedTree(self._condensed_tree)
+            return CondensedTree(self._condensed_tree, self.cluster_selection_method)
         else:
             warn('No condensed tree was generated; try running fit first.')
             return None

hdbscan/plots.py

@@ -205,8 +205,11 @@ def _select_clusters(self):
                             is_cluster[sub_node] = False
 
             return [cluster for cluster in is_cluster if is_cluster[cluster]]
-        else:
+        elif self.cluster_selection_method == 'leaf':
             return _get_leaves(self._raw_tree)
+        else:
+            raise ValueError('Invalid Cluster Selection Method: %s\n'
+                             'Should be one of: "eom", "leaf"\n')
 
     def plot(self, leaf_separation=1, cmap='viridis', select_clusters=False,
              label_clusters=False, selection_palette=None,