Add VertexMap to attach data to vertices

This commit is contained in:
2026-05-06 20:28:00 +02:00
parent 6e9867a65e
commit f40c03b113
6 changed files with 168 additions and 54 deletions
+23 -54
View File
@@ -8,22 +8,12 @@ fn dijkstra_single_vertex() {
let v1 = graph.add_vertex();
let result = algorithms::dijkstra(&graph, v1);
assert_eq!(
result.distances.len(),
1,
"distances count must equal vertex count"
);
assert_eq!(
result.predecessors.len(),
1,
"predecessors count must equal vertex count"
);
assert_eq!(
result.distances[0],
result.distances[v1],
Some(0),
"unexpected distance of source vertex"
);
assert_eq!(
result.predecessors[0], None,
result.predecessors[v1], None,
"unexpected predecessor of source vertex",
);
}
@@ -32,24 +22,23 @@ fn dijkstra_single_vertex() {
fn dijkstra_disconnected() {
let mut graph = AppendGraph::new();
let v1 = graph.add_vertex();
graph.add_vertex();
let v2 = graph.add_vertex();
let result = algorithms::dijkstra(&graph, v1);
assert_eq!(
result.distances.len(),
2,
"distances count must equal vertex count"
result.distances[v1],
Some(0),
"unexpected distance of source vertex"
);
assert_eq!(
result.predecessors.len(),
2,
"predecessors count must equal vertex count"
);
assert_eq!(
result.distances[1], None,
result.distances[v2], None,
"unexpected distance of disconnected vertex"
);
assert_eq!(
result.predecessors[0], None,
result.predecessors[v1], None,
"unexpected predecessor of source vertex",
);
assert_eq!(
result.predecessors[v2], None,
"unexpected predecessor of disconnected vertex",
);
}
@@ -82,26 +71,16 @@ fn dijkstra() {
vec![Some(vertices[4])],
vec![Some(vertices[5]), Some(vertices[6]), Some(vertices[7])],
];
assert_eq!(
result.distances.len(),
graph.vertex_count(),
"distances count must equal vertex count"
);
assert_eq!(
result.predecessors.len(),
graph.vertex_count(),
"predecessors count must equal vertex count"
);
for i in 0..graph.vertex_count() {
assert_eq!(
result.distances[i], expected_distances_from_v0[i],
result.distances[vertices[i]], expected_distances_from_v0[i],
"unexpected distance from {:?} to {:?}",
vertices[0], vertices[i]
);
assert!(
expected_predecessors_from_v0[i].contains(&result.predecessors[i]),
expected_predecessors_from_v0[i].contains(&result.predecessors[vertices[i]]),
"unexpected predecessor {:?} of {:?}",
result.predecessors[i],
result.predecessors[vertices[i]],
vertices[i]
);
}
@@ -113,12 +92,7 @@ fn dijkstra_distances_single_vertex() {
let v1 = graph.add_vertex();
let distances = algorithms::dijkstra_distances(&graph, v1);
assert_eq!(
distances.len(),
1,
"distances count must equal vertex count"
);
assert_eq!(
distances[0],
distances[v1],
Some(0),
"unexpected distance of source vertex"
);
@@ -128,16 +102,16 @@ fn dijkstra_distances_single_vertex() {
fn dijkstra_distances_disconnected() {
let mut graph = AppendGraph::new();
let v1 = graph.add_vertex();
graph.add_vertex();
let v2 = graph.add_vertex();
let distances = algorithms::dijkstra_distances(&graph, v1);
assert_eq!(
distances.len(),
2,
"distances count must equal vertex count"
distances[v1],
Some(0),
"unexpected distance of source vertex"
);
assert_eq!(
distances[1], None,
"unexpected distance of disconnected vertex"
distances[v2], None,
"unexpected distance of disconnected vertex",
);
}
@@ -157,14 +131,9 @@ fn dijkstra_distances() {
Some(3),
Some(4),
];
assert_eq!(
distances.len(),
graph.vertex_count(),
"distances count must equal vertex count"
);
for i in 0..graph.vertex_count() {
assert_eq!(
distances[i], expected_distances_from_v0[i],
distances[vertices[i]], expected_distances_from_v0[i],
"unexpected distance from {:?} to {:?}",
vertices[0], vertices[i]
);