comparison cnmf.py @ 18:b4bf37f94e92

prepared to add another annotation

 	# Find non filtered boundaries
 	bound_idxs = None
 	while True:
 		if bound_idxs is None:
 			try:
-				if CNMF: F, G = cnmf(X, rank, niter=niter)
-				else: F, G = nmf(X, rank, niter=niter)
+				if CNMF: F, G0 = cnmf(X, rank, niter=niter)
+				else: F, G0 = nmf(X, rank, niter=niter)
 			except:
-				return np.empty(0), [1]
+				return np.empty(0), np.empty(0), [1]
 
 			# Filter G
-			G = filter_activation_matrix(G.T, R)
+			G = filter_activation_matrix(G0.T, R)
 			if bound_idxs is None:
 				bound_idxs = np.where(np.diff(G) != 0)[0] + 1
 
 		if len(np.unique(bound_idxs)) <= 2:
 			rank += 1
 			bound_idxs = None
 		else:
 			break
-
-	return G, bound_idxs
+		
+		# Obtain decomposition matrices Rd
+		R = F.dot(G0)
+		print 'R, F, G', R.shape, F.shape, G.shape
+	return F, G0, R, bound_idxs