Merge branch 'dev' into sparse-distance-matrix

# Conflicts:
#	ripser.cpp

1 files changed, 6 insertions, 13 deletions

diff --git a/ripser.cpp b/ripser.cpp
index 59ff1a2..3b992d6 100644
--- a/ripser.cpp
+++ b/ripser.cpp
@@ -269,23 +269,16 @@ public:
 	}
 
 	index_t find(index_t x) {
-		index_t y = x, z = parent[y];
-		while (z != y) {
-			y = z;
-			z = parent[y];
-		}
-		y = parent[x];
-		while (z != y) {
-			parent[x] = z;
-			x = y;
-			y = parent[x];
+		index_t y = x, z;
+		while ((z = parent[y]) != y) y = z;
+		while ((z = parent[x]) != y) {
+			parent[x] = y;
+			x = z;
 		}
 		return z;
 	}
 	void link(index_t x, index_t y) {
-		x = find(x);
-		y = find(y);
-		if (x == y) return;
+		if ((x = find(x)) == (y = find(y))) return;
 		if (rank[x] > rank[y])
 			parent[y] = x;
 		else {