From 89d6a8e2e5b92ae0787c3254cec5f324da3362c8 Mon Sep 17 00:00:00 2001 From: Nathan Brooks Date: Sat, 2 Jan 2021 14:03:49 -0800 Subject: add product_index, combination_index, and permutation_index functions --- tests/test_more.py | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'tests/test_more.py') diff --git a/tests/test_more.py b/tests/test_more.py index 665ee07..7ac88e4 100644 --- a/tests/test_more.py +++ b/tests/test_more.py @@ -4274,7 +4274,7 @@ class CombinationIndexTests(TestCase): r = 4 first_index = {} for index, element in enumerate(combinations(iterable, r)): - actual = mi.combination_index(iterable, element) + actual = mi.combination_index(element, iterable) expected = first_index.setdefault(element, index) self.assertEqual(actual, expected) @@ -4283,7 +4283,7 @@ class CombinationIndexTests(TestCase): r = len(iterable) first_index = {} for index, element in enumerate(combinations(iterable, r=r)): - actual = mi.permutation_index(iterable, element) + actual = mi.combination_index(element, iterable) expected = first_index.setdefault(element, index) self.assertEqual(actual, expected) @@ -4292,31 +4292,31 @@ class CombinationIndexTests(TestCase): r = 3 first_index = {} for index, element in enumerate(combinations(iterable, r)): - actual = mi.combination_index(iterable, element) + actual = mi.combination_index(element, iterable) expected = first_index.setdefault(element, index) self.assertEqual(actual, expected) def test_null(self): - actual = mi.combination_index([], tuple()) + actual = mi.combination_index(tuple(), []) expected = 0 self.assertEqual(actual, expected) def test_long(self): - actual = mi.combination_index(range(180), (2, 12, 35, 126)) + actual = mi.combination_index((2, 12, 35, 126), range(180)) expected = 2000000 self.assertEqual(actual, expected) def test_invalid_order(self): with self.assertRaises(ValueError): - mi.combination_index('abcde', tuple('acb')) + mi.combination_index(tuple('acb'), 'abcde') def test_invalid_large(self): with self.assertRaises(ValueError): - mi.combination_index('abcdef', tuple('abcdefg')) + mi.combination_index(tuple('abcdefg'), 'abcdef') def test_invalid_match(self): with self.assertRaises(ValueError): - mi.product_index('abcde', tuple('axe')) + mi.product_index(tuple('axe'), 'abcde') class PermutationIndexTests(TestCase): @@ -4325,7 +4325,7 @@ class PermutationIndexTests(TestCase): r = 4 first_index = {} for index, element in enumerate(permutations(iterable, r)): - actual = mi.permutation_index(iterable, element) + actual = mi.permutation_index(element, iterable) expected = first_index.setdefault(element, index) self.assertEqual(actual, expected) @@ -4333,7 +4333,7 @@ class PermutationIndexTests(TestCase): iterable = 'abcd' first_index = {} for index, element in enumerate(permutations(iterable)): - actual = mi.permutation_index(iterable, element) + actual = mi.permutation_index(element, iterable) expected = first_index.setdefault(element, index) self.assertEqual(actual, expected) @@ -4342,24 +4342,24 @@ class PermutationIndexTests(TestCase): r = 3 first_index = {} for index, element in enumerate(permutations(iterable, r)): - actual = mi.permutation_index(iterable, element) + actual = mi.permutation_index(element, iterable) expected = first_index.setdefault(element, index) self.assertEqual(actual, expected) def test_null(self): - actual = mi.permutation_index([], tuple()) + actual = mi.permutation_index(tuple(), []) expected = 0 self.assertEqual(actual, expected) def test_long(self): - actual = mi.permutation_index(range(180), (2, 12, 35, 126)) + actual = mi.permutation_index((2, 12, 35, 126), range(180)) expected = 11631678 self.assertEqual(actual, expected) def test_invalid_large(self): with self.assertRaises(ValueError): - mi.permutation_index('abcdef', tuple('abcdefg')) + mi.permutation_index(tuple('abcdefg'), 'abcdef') def test_invalid_match(self): with self.assertRaises(ValueError): - mi.product_index('abcde', tuple('axe')) + mi.product_index(tuple('axe'), 'abcde') -- cgit v1.2.3