Skip to content

Commit 4f92d8f

Browse files
thestingergraydon
authored andcommitted
make intersection O(n+m) instead of O(n*log(m))
1 parent 9fb4908 commit 4f92d8f

File tree

1 file changed

+18
-4
lines changed

1 file changed

+18
-4
lines changed

src/libstd/treemap.rs

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -338,10 +338,24 @@ impl <T: Ord> TreeSet<T> {
338338

339339
/// Visit the values (in-order) representing the intersection
340340
pure fn intersection(&self, other: &TreeSet<T>, f: fn(&T) -> bool) {
341-
// FIXME: this is a naive O(n*log(m)) implementation, could be O(n + m)
342-
for self.each |x| {
343-
if other.contains(x) {
344-
if !f(x) { break }
341+
let mut x = self.iter();
342+
let mut y = other.iter();
343+
344+
unsafe { // purity workaround
345+
let mut a = x.next();
346+
let mut b = y.next();
347+
348+
while a.is_some() && b.is_some() {
349+
let a1 = a.unwrap();
350+
let b1 = b.unwrap();
351+
if a1 < b1 {
352+
a = x.next();
353+
} else {
354+
if !(b1 < a1) {
355+
if !f(a1) { return }
356+
}
357+
b = y.next();
358+
}
345359
}
346360
}
347361
}

0 commit comments

Comments
 (0)