improved spatial index

Author: radevgit

benches/bench_offset_multiple.rs

@@ -36,8 +36,14 @@ fn main() {
 /*
 > cargo bench
 
+Base:
 Total time for 298 offset operations: 196.589137ms
 Average time per operation: 659.695µs
 Operations per second: 1515.9
 
+Spatial index:
+Total time for 298 offset operations: 190.66736ms
+Average time per operation: 639.823µs
+Operations per second: 1562.9
+
 */

benches/bench_offset_multiple1000.rs

@@ -40,10 +40,10 @@ Total time for 50 offset operations: 19.007039989s
 Average time per operation: 380.140799ms
 Operations per second: 2.6
 
-SPATIAL INDEX (USE_BRUTE_FORCE = false):
-Total time for 50 offset operations: 6.249249758s
-Average time per operation: 124.984995ms
-Operations per second: 8.0
+SPATIAL INDEX (USE_BRUTE_FORCE = false) - polyarcs only:
+Total time for 50 offset operations: 5.05559079s
+Average time per operation: 101.111815ms
+Operations per second: 9.9
 
-SPEEDUP: 3.04x faster with spatial index
+SPEEDUP: 3.76x faster with spatial index
 */

benches/bench_offset_multiple200.rs

@@ -35,16 +35,15 @@ fn main() {
 /*
 > cargo bench --bench bench_offset_multiple200
 
-Base
 BRUTE-FORCE (USE_BRUTE_FORCE = true):
 Total time for 198 offset operations: 3.431741022s
 Average time per operation: 17.332025ms
 Operations per second: 57.7
 
-SPATIAL INDEX (USE_BRUTE_FORCE = false):
-Total time for 198 offset operations: 1.314992506s
-Average time per operation: 6.641376ms
-Operations per second: 150.6
+SPATIAL INDEX (USE_BRUTE_FORCE = false) - polyarcs only:
+Total time for 198 offset operations: 1.236930339s
+Average time per operation: 6.247122ms
+Operations per second: 160.1
 
-SPEEDUP: 2.61x faster with spatial index
+SPEEDUP: 2.77x faster with spatial index
 */

benches/bench_offset_multiple500.rs

@@ -40,10 +40,10 @@ Total time for 198 offset operations: 14.44784818s
 Average time per operation: 72.96893ms
 Operations per second: 13.7
 
-SPATIAL INDEX (USE_BRUTE_FORCE = false):
-Total time for 198 offset operations: 6.224936148s
-Average time per operation: 31.439071ms
-Operations per second: 31.8
+SPATIAL INDEX (USE_BRUTE_FORCE = false) - polyarcs only:
+Total time for 198 offset operations: 5.527450981s
+Average time per operation: 27.916419ms
+Operations per second: 35.8
 
-SPEEDUP: 2.32x faster with spatial index
+SPEEDUP: 2.61x faster with spatial index
 */

src/offset_prune_invalid.rs

@@ -36,9 +36,8 @@ fn offset_prune_invalid_spatial(
         .filter(|arc| arc.is_valid(PRUNE_EPSILON))
         .collect();
 
-    // Build spatial index containing both polyarcs and offsets
-    let polyarc_count = polyarcs.len();
-    let mut spatial_index = HilbertRTree::with_capacity(polyarc_count + offsets.len());
+    // Build spatial index containing only polyarcs (with expansion for search radius)
+    let mut spatial_index = HilbertRTree::with_capacity(polyarcs.len());
 
     // Add polyarcs to index with offset + epsilon expansion (done once)
     let search_radius = off + PRUNE_EPSILON;
@@ -47,19 +46,13 @@ fn offset_prune_invalid_spatial(
         spatial_index.add(min_x, max_x, min_y, max_y);
     }
 
-    // Add offsets to index
-    for arc in offsets.iter() {
-        let (min_x, max_x, min_y, max_y) = arc_bounds(arc);
-        spatial_index.add(min_x, max_x, min_y, max_y);
-    }
-    
     spatial_index.build();
 
     while offsets.len() > 0 {
         let offset = offsets.pop().unwrap();
         valid.push(offset.clone());
 
-        // Query nearby arcs using spatial index
+        // Query nearby polyarcs using spatial index
         let (offset_min_x, offset_max_x, offset_min_y, offset_max_y) =
             arc_bounds(&offset);
         let mut nearby_indices = Vec::new();
@@ -73,16 +66,14 @@ fn offset_prune_invalid_spatial(
 
         // Check only nearby polyarcs for actual distance
         for idx in nearby_indices {
-            if idx < polyarc_count {
-                let p = &polyarcs[idx];
-                if p.id == offset.id {
-                    continue; // skip self offsets
-                }
-                let dist = distance_element_element(p, &offset);
-                if dist < off - PRUNE_EPSILON {
-                    valid.pop();
-                    break;
-                }
+            let p = &polyarcs[idx];
+            if p.id == offset.id {
+                continue; // skip self offsets
+            }
+            let dist = distance_element_element(p, &offset);
+            if dist < off - PRUNE_EPSILON {
+                valid.pop();
+                break;
             }
         }
     }