From 640592b4111b08d1210d34c890c486dcbca527c7 Mon Sep 17 00:00:00 2001
From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Thu, 21 Jan 2021 09:39:15 +0100
Subject: [PATCH] Move some code from insert() into Search

---
 src/lib.rs | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 8ac16da..328c0c5 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -404,14 +404,16 @@ fn insert<P: Point>(
         let &Candidate { distance, pid } = candidate;
         if let Some(heuristic) = heuristic {
             insertion.reset();
-            let candidate_point = &points[pid];
-            insertion.push(new, candidate_point, points);
-            for hop in layer.as_slice().nearest_iter(pid) {
-                insertion.push(hop, candidate_point, points);
-            }
+            let found = insertion.add_neighbor_heuristic(
+                new,
+                layer.as_slice().nearest_iter(pid),
+                layer,
+                M * 2,
+                &points[pid],
+                points,
+                *heuristic,
+            );
 
-            let found =
-                insertion.select_heuristic(&layer, M * 2, candidate_point, points, *heuristic);
             layer[pid].rewrite(found.iter().map(|candidate| candidate.pid));
             layer[new].set(i, pid);
         } else {
@@ -512,6 +514,23 @@ impl Search {
         self.nearest.truncate(self.ef);
     }
 
+    fn add_neighbor_heuristic<P: Point>(
+        &mut self,
+        new: PointId,
+        current: impl Iterator<Item = PointId>,
+        layer: &[ZeroNode],
+        num: usize,
+        point: &P,
+        points: &[P],
+        params: Heuristic,
+    ) -> &[Candidate] {
+        self.push(new, point, points);
+        for pid in current {
+            self.push(pid, point, points);
+        }
+        self.select_heuristic(&layer, num, point, points, params)
+    }
+
     fn select_heuristic<P: Point>(
         &mut self,
         layer: &[ZeroNode],