Skip to content

Commit

Permalink
Merge pull request #5 from jakirkham/rename_split_blocks
Browse files Browse the repository at this point in the history
Rename `blocks_split` to `split_blocks`
  • Loading branch information
jakirkham committed Oct 27, 2016
2 parents 0a19d31 + b2ab942 commit 4ae8309
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions kenjutsu/kenjutsu.py
Expand Up @@ -379,7 +379,7 @@ def len_slices(slices, lengths=None):
return(lens)


def blocks_split(space_shape, block_shape, block_halo=None):
def split_blocks(space_shape, block_shape, block_halo=None):
"""
Return a list of slicings to cut each block out of an array or other.
Expand All @@ -405,7 +405,7 @@ def blocks_split(space_shape, block_shape, block_halo=None):
Examples:
>>> blocks_split(
>>> split_blocks(
... (2, 3,), (1, 1,), (1, 1,)
... ) #doctest: +NORMALIZE_WHITESPACE
([(slice(0, 1, 1), slice(0, 1, 1)),
Expand Down
12 changes: 6 additions & 6 deletions tests/test_kenjutsu.py
Expand Up @@ -21,24 +21,24 @@ def setUp(self):
pass


def test_blocks_split(self):
blocks = kenjutsu.blocks_split((2,), (1,))
def test_split_blocks(self):
blocks = kenjutsu.split_blocks((2,), (1,))
self.assertEqual(
blocks,
([(slice(0, 1, 1),), (slice(1, 2, 1),)],
[(slice(0, 1, 1),), (slice(1, 2, 1),)],
[(slice(0, 1, 1),), (slice(0, 1, 1),)])
)

blocks = kenjutsu.blocks_split((2,), (-1,))
blocks = kenjutsu.split_blocks((2,), (-1,))
self.assertEqual(
blocks,
([(slice(0, 2, 1),)],
[(slice(0, 2, 1),)],
[(slice(0, 2, 1),)])
)

blocks = kenjutsu.blocks_split((2, 3,), (1, 1,))
blocks = kenjutsu.split_blocks((2, 3,), (1, 1,))
self.assertEqual(
blocks,
([(slice(0, 1, 1), slice(0, 1, 1)),
Expand All @@ -61,7 +61,7 @@ def test_blocks_split(self):
(slice(0, 1, 1), slice(0, 1, 1))])
)

blocks = kenjutsu.blocks_split((2, 3,), (1, 1,), (0, 0))
blocks = kenjutsu.split_blocks((2, 3,), (1, 1,), (0, 0))
self.assertEqual(
blocks,
([(slice(0, 1, 1), slice(0, 1, 1)),
Expand All @@ -84,7 +84,7 @@ def test_blocks_split(self):
(slice(0, 1, 1), slice(0, 1, 1))])
)

blocks = kenjutsu.blocks_split((10, 12,), (3, 2,), (4, 3,))
blocks = kenjutsu.split_blocks((10, 12,), (3, 2,), (4, 3,))
self.assertEqual(
blocks,
([(slice(0, 3, 1), slice(0, 2, 1)),
Expand Down

0 comments on commit 4ae8309

Please sign in to comment.