Add weight parameter for Dijkstra's algorithm, add unweighted variants (unused)
This commit is contained in:
+6
-6
@@ -6,7 +6,7 @@ use grapherity::traits::GraphTopology;
|
||||
fn dijkstra_single_vertex() {
|
||||
let mut graph = AppendGraph::new();
|
||||
let v1 = graph.add_vertex();
|
||||
let result = algorithms::dijkstra(&graph, v1);
|
||||
let result = algorithms::dijkstra_unweighted(&graph, v1);
|
||||
assert_eq!(
|
||||
result.distances[v1],
|
||||
Some(0),
|
||||
@@ -23,7 +23,7 @@ fn dijkstra_disconnected() {
|
||||
let mut graph = AppendGraph::new();
|
||||
let v1 = graph.add_vertex();
|
||||
let v2 = graph.add_vertex();
|
||||
let result = algorithms::dijkstra(&graph, v1);
|
||||
let result = algorithms::dijkstra_unweighted(&graph, v1);
|
||||
assert_eq!(
|
||||
result.distances[v1],
|
||||
Some(0),
|
||||
@@ -46,7 +46,7 @@ fn dijkstra_disconnected() {
|
||||
#[test]
|
||||
fn dijkstra() {
|
||||
let (graph, vertices) = make_test_graph();
|
||||
let result = algorithms::dijkstra(&graph, vertices[0]);
|
||||
let result = algorithms::dijkstra_unweighted(&graph, vertices[0]);
|
||||
let expected_distances_from_v0 = [
|
||||
Some(0),
|
||||
Some(1),
|
||||
@@ -90,7 +90,7 @@ fn dijkstra() {
|
||||
fn dijkstra_distances_single_vertex() {
|
||||
let mut graph = AppendGraph::new();
|
||||
let v1 = graph.add_vertex();
|
||||
let distances = algorithms::dijkstra_distances(&graph, v1);
|
||||
let distances = algorithms::dijkstra_distances_unweighted(&graph, v1);
|
||||
assert_eq!(
|
||||
distances[v1],
|
||||
Some(0),
|
||||
@@ -103,7 +103,7 @@ fn dijkstra_distances_disconnected() {
|
||||
let mut graph = AppendGraph::new();
|
||||
let v1 = graph.add_vertex();
|
||||
let v2 = graph.add_vertex();
|
||||
let distances = algorithms::dijkstra_distances(&graph, v1);
|
||||
let distances = algorithms::dijkstra_distances_unweighted(&graph, v1);
|
||||
assert_eq!(
|
||||
distances[v1],
|
||||
Some(0),
|
||||
@@ -118,7 +118,7 @@ fn dijkstra_distances_disconnected() {
|
||||
#[test]
|
||||
fn dijkstra_distances() {
|
||||
let (graph, vertices) = make_test_graph();
|
||||
let distances = algorithms::dijkstra_distances(&graph, vertices[0]);
|
||||
let distances = algorithms::dijkstra_distances_unweighted(&graph, vertices[0]);
|
||||
let expected_distances_from_v0 = [
|
||||
Some(0),
|
||||
Some(1),
|
||||
|
||||
Reference in New Issue
Block a user