Make conway updating considerably faster

conway.py

@@ -19,10 +19,7 @@ def conway(state, k=None):
     b = fft_convolve2d(state,k).round()
     c = np.zeros(b.shape)
 
-    c[np.where((b == 2) & (state == 1))] = 1
-    c[np.where((b == 3) & (state == 1))] = 1
-
-    c[np.where((b == 3) & (state == 0))] = 1
+    c[((b == 2) & (state == 1)) | (b == 3)] = 1
 
     # return new state
     return c

lib/lib.py

@@ -1,14 +1,14 @@
 from numpy.fft import fft2, ifft2, fftshift
 import numpy as np
-
+	
 def fft_convolve2d(x,y):
-    """
-    2D convolution, using FFT
-    """
-    fr = fft2(x)
-    fr2 = fft2(np.flipud(np.fliplr(y)))
-    m,n = fr.shape
-    cc = np.real(ifft2(fr*fr2))
-    cc = np.roll(cc, - int(m / 2) + 1, axis=0)
-    cc = np.roll(cc, - int(n / 2) + 1, axis=1)
-    return cc
+	"""
+	2D convolution, using FFT
+	"""
+	fr = fft2(x)
+	fr2 = fft2(np.flipud(np.fliplr(y)))
+	m,n = fr.shape
+	cc = np.real(ifft2(fr*fr2))
+	cc = np.roll(cc, - int(m / 2) + 1, axis=0)
+	cc = np.roll(cc, - int(n / 2) + 1, axis=1)
+	return cc