From 7c6ceaa26bbf041a9cbd6a0818bbeb6f3a70f78c Mon Sep 17 00:00:00 2001 From: "damian.eads" Date: Tue, 25 Nov 2008 04:24:42 +0000 Subject: [PATCH] Covered a few more edge conditions for scipy.cluster.hierarchy.is_valid_linkage. --- scipy/cluster/hierarchy.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scipy/cluster/hierarchy.py b/scipy/cluster/hierarchy.py index e38688c809ed..1811119b43c2 100644 --- a/scipy/cluster/hierarchy.py +++ b/scipy/cluster/hierarchy.py @@ -1241,11 +1241,11 @@ def is_valid_linkage(Z, warning=False, throw=False, name=None): raise ValueError('Linkage \'%s\' uses the same cluster more than once.' % name) else: raise ValueError('Linkage uses the same cluster more than once.') - if _check_hierarchy_not_all_clusters_used(Z): - if name: - raise ValueError('Linkage \'%s\' does not use all clusters.' % name) - else: - raise ValueError('Linkage does not use all clusters.') +# if _check_hierarchy_not_all_clusters_used(Z): +# if name: +# raise ValueError('Linkage \'%s\' does not use all clusters.' % name) +# else: +# raise ValueError('Linkage does not use all clusters.') except Exception, e: if throw: raise