about summary refs log tree commit diff
path: root/gn3/computations
diff options
context:
space:
mode:
Diffstat (limited to 'gn3/computations')
-rw-r--r--gn3/computations/slink.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/gn3/computations/slink.py b/gn3/computations/slink.py
index 7b4016a..3156b31 100644
--- a/gn3/computations/slink.py
+++ b/gn3/computations/slink.py
@@ -70,6 +70,9 @@ This description should be updated once the form/type of 'distance' identified."
     raise_mirrorerror_of_distances_one_way_are_not_same_other_way(lists)
     raise_valueerror_on_negative_distances(lists)
     #### END: Guard Functions ####
-    return None
     if type(i) == int and type(j) == int: # From member i to member j
         return lists[i][j]
+    elif type(i) == int and (type(j) in [list, tuple]):
+        return min(map(lambda j_new: nearest(lists, i, j_new), j))
+    elif type(j) == int and (type(i) in [list, tuple]):
+        return min(map(lambda i_new: nearest(lists, i_new, j), i))