[Scipy-svn] r5187 - trunk/scipy/cluster

scipy-svn@scip... scipy-svn@scip...
Mon Nov 24 22:24:44 CST 2008


Author: damian.eads
Date: 2008-11-24 22:24:42 -0600 (Mon, 24 Nov 2008)
New Revision: 5187

Modified:
   trunk/scipy/cluster/hierarchy.py
Log:
Covered a few more edge conditions for scipy.cluster.hierarchy.is_valid_linkage.

Modified: trunk/scipy/cluster/hierarchy.py
===================================================================
--- trunk/scipy/cluster/hierarchy.py	2008-11-25 04:23:49 UTC (rev 5186)
+++ trunk/scipy/cluster/hierarchy.py	2008-11-25 04:24:42 UTC (rev 5187)
@@ -1241,11 +1241,11 @@
                 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



More information about the Scipy-svn mailing list