diff options
| -rw-r--r-- | gn3/computations/slink.py | 8 | ||||
| -rw-r--r-- | tests/unit/computations/test_slink.py | 16 |
2 files changed, 24 insertions, 0 deletions
diff --git a/gn3/computations/slink.py b/gn3/computations/slink.py index b15c058..880ce9f 100644 --- a/gn3/computations/slink.py +++ b/gn3/computations/slink.py @@ -1,3 +1,5 @@ +from functools import partial + class LengthError(BaseException): pass @@ -77,3 +79,9 @@ This description should be updated once the form/type of 'distance' identified." return min(map(lambda j_new: nearest(lists, i, j_new), j)) elif type(j) == int and is_list_or_tuple(i): return min(map(lambda i_new: nearest(lists, i_new, j), i)) + elif is_list_or_tuple(i) and is_list_or_tuple(j): + partial_i = map(lambda x:partial(nearest, lists, x), i[:-1]) + ns = list(map(lambda f, x: f(x), partial_i, j[:1])) + return min(ns) + else: + raise ValueError("member values (i or j) should be lists/tuples of integers or integers") diff --git a/tests/unit/computations/test_slink.py b/tests/unit/computations/test_slink.py index 64d123c..dd42d5d 100644 --- a/tests/unit/computations/test_slink.py +++ b/tests/unit/computations/test_slink.py @@ -184,3 +184,19 @@ class TestSlink(TestCase): expected_distance=ed): self.assertEqual(nearest(md, ml, mc), ed) self.assertEqual(nearest(md, mc, ml), ed) + + def test_given_2_lists_or_tuples_of_members_distances_nearest_returns_shortest_distance(self): + for md, ml, mc, ed in [ + [[[0,9,3,6,11],[9,0,7,5,10],[3,7,0,9,2],[6,5,9,0,8],[11,10,2,8,0]], + [0,1,2,3,4],[0,1,2,3,4],0], + [[[0,9,3,6,11],[9,0,7,5,10],[3,7,0,9,2],[6,5,9,0,8],[11,10,2,8,0]], + [0,1],[3,4],6], + [[[0,9,3,6,11],[9,0,7,5,10],[3,7,0,9,2],[6,5,9,0,8],[11,10,2,8,0]], + [0,1],[2,3,4],3], + [[[0,9,3,6,11],[9,0,7,5,10],[3,7,0,9,2],[6,5,9,0,8],[11,10,2,8,0]], + [0,2],[3,4],6]]: + with self.subTest( + members_distances=md, members_list=ml, member_coordinate=mc, + expected_distance=ed): + self.assertEqual(nearest(md, ml, mc), ed) + self.assertEqual(nearest(md, mc, ml), ed) |