diff --git a/mini_proj/_cutter.py b/mini_proj/_cutter.py index f6414e0..4ff5c7c 100644 --- a/mini_proj/_cutter.py +++ b/mini_proj/_cutter.py @@ -8,19 +8,19 @@ def image_cut(image, size0, size1): dims = image.shape assert dims[0] >= size0 assert dims[1] >= size1 - return np.array([image[size0 * i:size0 * (i+1), size1 * j:size1 * (j+1)] \ + return np.array([image[size0 * i:size0 * (i+1), size1 * j:size1 * (j+1), :] \ for i in range(dims[0] // size0) for j in range(dims[1] // size1)] + \ [image[size0 * i:size0 * (i+1), dims[1]-size1:] \ for i in range(dims[0] // size0) if dims[1] % size1 != 0] + \ [image[dims[0]-size0:, size1 * j:size1 * (j+1)] \ - for j in range(dims[1] // size1) if dims[0] % size0 != \ + for j in range(dims[1] // size1) if dims[0] % size0 != 0] \ ) if __name__ == '__main__': # test = np.random.rand(5,4,3) test = np.array([[ - k + 4*j for k in range(4) + [k + 4*j, k + 4*j] for k in range(4) ] for j in range(5)]) print(test) print(image_cut(test, 2, 2)) diff --git a/mini_proj/report/waldo.tex b/mini_proj/report/waldo.tex index 856f002..28d2689 100644 --- a/mini_proj/report/waldo.tex +++ b/mini_proj/report/waldo.tex @@ -59,7 +59,7 @@ as) Waldo, but are not actually Waldo. \begin{figure}[ht] - \includegraphics[scale=0.35]{waldo} + \includegraphics[scale=0.35]{waldo.png} \centering \caption{ A headshot of the character ``Waldo'', or ``Wally''. Pictures of Waldo