rewrote chained comparisons in _optimize_layout_aligned_euclidean_sin…

…gle_epoch
leriomaggio · Jul 29, 2021 · 4201631 · 4201631
1 parent 3992e96
commit 4201631
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -3,4 +3,5 @@ scipy>=1.3.1
 scikit-learn>=0.22
 numba>=0.51.2
 pynndescent>=0.5
-tbb>=2019.0
+tbb>=2019.0
+tqdm
diff --git a/umap/layouts.py b/umap/layouts.py
@@ -860,9 +860,7 @@ def _optimize_layout_aligned_euclidean_single_epoch(
                     for offset in range(-window_size, window_size):
                         neighbor_m = m + offset
                         if (
-                            neighbor_m >= 0
-                            and neighbor_m < n_embeddings
-                            and offset != 0
+                                n_embeddings > neighbor_m >= 0 != offset
                         ):
                             identified_index = relations[m, offset + window_size, j]
                             if identified_index >= 0:
@@ -884,9 +882,7 @@ def _optimize_layout_aligned_euclidean_single_epoch(
                         for offset in range(-window_size, window_size):
                             neighbor_m = m + offset
                             if (
-                                neighbor_m >= 0
-                                and neighbor_m < n_embeddings
-                                and offset != 0
+                                    n_embeddings > neighbor_m >= 0 != offset
                             ):
                                 identified_index = relations[m, offset + window_size, k]
                                 if identified_index >= 0:
@@ -940,11 +936,7 @@ def _optimize_layout_aligned_euclidean_single_epoch(
 
                         for offset in range(-window_size, window_size):
                             neighbor_m = m + offset
-                            if (
-                                neighbor_m >= 0
-                                and neighbor_m < n_embeddings
-                                and offset != 0
-                            ):
+                            if n_embeddings > neighbor_m >= 0 != offset:
                                 identified_index = relations[m, offset + window_size, j]
                                 if identified_index >= 0:
                                     grad_d -= clip(