alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2025-01-12 01:51:34 +11:00
Code Issues Packages Projects Releases Wiki Activity

Wrap distance_to_initial_bucket a bit better

Browse source
This commit is contained in:
Gwilym Kuiper 2022-03-20 14:14:22 +00:00
parent 3f624ee87d
commit 9bfb8de481
1 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
agb/src/hash_map.rs
View file

@ -258,12 +258,12 @@ impl<K, V> NodeStorage<K, V> {
loop { loop {
let location = fast_mod( let location = fast_mod(
self.capacity(), self.capacity(),
new_node.hash + new_node.distance_to_initial_bucket as HashType, new_node.hash + new_node.get_distance() as HashType,
); );
let current_node = &mut self.nodes[location]; let current_node = &mut self.nodes[location];
if current_node.has_value() { if current_node.has_value() {
if current_node.distance_to_initial_bucket <= new_node.distance_to_initial_bucket { if current_node.get_distance() <= new_node.get_distance() {
mem::swap(&mut new_node, current_node); mem::swap(&mut new_node, current_node);
} }
} else { } else {
@ -271,9 +271,9 @@ impl<K, V> NodeStorage<K, V> {
break; break;
} }
new_node.distance_to_initial_bucket += 1; new_node.increment_distance();
self.max_distance_to_initial_bucket = new_node self.max_distance_to_initial_bucket = new_node
.distance_to_initial_bucket .get_distance()
.max(self.max_distance_to_initial_bucket); .max(self.max_distance_to_initial_bucket);
} }
@ -290,13 +290,13 @@ impl<K, V> NodeStorage<K, V> {
// if the next node is empty, or the next location has 0 distance to initial bucket then // if the next node is empty, or the next location has 0 distance to initial bucket then
// we can clear the current node // we can clear the current node
if !self.nodes[next_location].has_value() if !self.nodes[next_location].has_value()
|| self.nodes[next_location].distance_to_initial_bucket == 0 || self.nodes[next_location].get_distance() == 0
{ {
return self.nodes[current_location].take_key_value().unwrap().1; return self.nodes[current_location].take_key_value().unwrap().1;
} }
self.nodes.swap(current_location, next_location); self.nodes.swap(current_location, next_location);
self.nodes[current_location].distance_to_initial_bucket -= 1; self.nodes[current_location].decrement_distance();
current_location = next_location; current_location = next_location;
} }
} }
@ -420,6 +420,21 @@ impl<K, V> Node<K, V> {
panic!("Cannot replace an uninitialised node"); panic!("Cannot replace an uninitialised node");
} }
} }
fn increment_distance(&mut self) {
self.distance_to_initial_bucket += 1;
}
fn decrement_distance(&mut self) {
self.distance_to_initial_bucket -= 1;
if self.distance_to_initial_bucket < 0 {
panic!("Cannot decrement distance to below 0");
}
}
fn get_distance(&self) -> i32 {
self.distance_to_initial_bucket
}
} }
impl<K, V> Drop for Node<K, V> { impl<K, V> Drop for Node<K, V> {