Fixes for clustering tester

shogun-toolbox · Aug 31, 2011 · f6512c7 · f6512c7
1 parent 4240e55
commit f6512c7
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/testsuite/python_modular/clustering.py b/testsuite/python_modular/clustering.py
@@ -17,18 +17,20 @@ def _evaluate (indata):
 		return False
 
 	feats=util.get_features(indata, 'distance_')
+	print feats['train'].get_num_vectors()
 	dfun=eval(indata['distance_name'])
 	distance=dfun(feats['train'], feats['train'])
 
 	cfun=eval(indata['clustering_name'])
 	clustering=cfun(first_arg, distance)
 	clustering.train()
 
-	distance.init(feats['train'], feats['test'])
+	print clustering.get_k()
+
 	if indata.has_key('clustering_radi'):
 		radi=max(abs(clustering.get_radiuses()-indata['clustering_radi']))
-		centers=max(abs(clustering.get_cluster_centers()- \
-			indata['clustering_centers']).flat)
+		centers=max(abs(clustering.get_cluster_centers().flatten() - \
+			indata['clustering_centers'].flat))
 		return util.check_accuracy(indata['clustering_accuracy'],
 			radi=radi, centers=centers)
 	elif indata.has_key('clustering_merge_distance'):