Group work for a Monash Research Methods course

Merge remote-tracking branch 'origin/master'

+4 -4
+3 -3
mini_proj/_cutter.py
··· 8 8 dims = image.shape 9 9 assert dims[0] >= size0 10 10 assert dims[1] >= size1 11 - return np.array([image[size0 * i:size0 * (i+1), size1 * j:size1 * (j+1)] \ 11 + return np.array([image[size0 * i:size0 * (i+1), size1 * j:size1 * (j+1), :] \ 12 12 for i in range(dims[0] // size0) for j in range(dims[1] // size1)] + \ 13 13 [image[size0 * i:size0 * (i+1), dims[1]-size1:] \ 14 14 for i in range(dims[0] // size0) if dims[1] % size1 != 0] + \ 15 15 [image[dims[0]-size0:, size1 * j:size1 * (j+1)] \ 16 - for j in range(dims[1] // size1) if dims[0] % size0 != \ 16 + for j in range(dims[1] // size1) if dims[0] % size0 != 0] \ 17 17 ) 18 18 19 19 20 20 if __name__ == '__main__': 21 21 # test = np.random.rand(5,4,3) 22 22 test = np.array([[ 23 - k + 4*j for k in range(4) 23 + [k + 4*j, k + 4*j] for k in range(4) 24 24 ] for j in range(5)]) 25 25 print(test) 26 26 print(image_cut(test, 2, 2))
+1 -1
mini_proj/report/waldo.tex
··· 59 59 as) Waldo, but are not actually Waldo. 60 60 61 61 \begin{figure}[ht] 62 - \includegraphics[scale=0.35]{waldo} 62 + \includegraphics[scale=0.35]{waldo.png} 63 63 \centering 64 64 \caption{ 65 65 A headshot of the character ``Waldo'', or ``Wally''. Pictures of Waldo