timeshifter/projecteuler
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean up dijkstra

Browse Source
This commit is contained in:
Dr. Matthias Ratajczak
2022-11-02 13:50:20 +01:00
parent b305da92d0
commit 8756fa7dcc
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/dijkstra/src/lib.rs
+10 -8
View File
@@ -96,18 +96,18 @@ where
while !(self.unvisited_without_distance.is_empty()
&& self.unvisited_with_distance.is_empty())
{
let coord = self.get_unvisited_coord_with_smallest_distance_from_start();
let neighbours = self.get_neighbours(&coord);
let previous_distance = *self.matrix.get(coord).unwrap().get_distance().unwrap();
let to_visit = self.get_unvisited_coord_with_smallest_distance_from_start();
self.visit(to_visit);
let neighbours = self.get_neighbours(&to_visit);
let previous_distance = *self.matrix.get(to_visit).unwrap().get_distance().unwrap();
for neighbour in neighbours {
self.update_neighbour(neighbour, coord, previous_distance);
self.update_neighbour(neighbour, to_visit, previous_distance);
}
}
}
fn get_unvisited_coord_with_smallest_distance_from_start(&mut self) -> Coordinate {
let coord = self
.unvisited_with_distance
self.unvisited_with_distance
.iter()
.filter_map(|c| {
let node = self.matrix.get(*c).unwrap();
@@ -115,9 +115,11 @@ where
})
.reduce(|(c0, v0), (c1, v1)| if v0 < v1 { (c0, v0) } else { (c1, v1) })
.map(|(c, _)| *c)
.unwrap_or(self.start);
.unwrap_or(self.start)
}
fn visit(&mut self, coord: (usize, usize)) {
self.unvisited_with_distance.remove(&coord);
coord
}
fn get_neighbours(&self, coordinate: &Coordinate) -> Vec<Coordinate> {