Better graph everywhere

Author: vigna

algo/tests/test_ess_coverage.rs

@@ -9,10 +9,44 @@ use dsi_progress_logger::no_logging;
 use webgraph::graphs::vec_graph::VecGraph;
 use webgraph_algo::distances::exact_sum_sweep::{self, Level};
 
-/// Directed graph with a cycle and a sink: 0→1→2→3→0, 2→4.
+/// Canonical test graph (8 nodes, 11 arcs).
+///
+/// - Outdegree 0: node 7 (sink)
+/// - Outdegree 1: nodes 2, 3, 4, 6
+/// - Outdegree 2: nodes 0, 5
+/// - Outdegree 3: node 1
+/// - Indegree 0: node 0 (source)
+/// - Indegree 1: nodes 1, 3, 5, 7
+/// - Indegree 2: nodes 2, 4
+/// - Indegree 3: node 6
+/// - Cycle: 2 → 4 → 6 → 2
 fn directed_graph() -> (VecGraph, VecGraph) {
-    let graph = VecGraph::from_arcs([(0, 1), (1, 2), (2, 3), (3, 0), (2, 4)]);
-    let transpose = VecGraph::from_arcs([(1, 0), (2, 1), (3, 2), (0, 3), (4, 2)]);
+    let graph = VecGraph::from_arcs([
+        (0, 1),
+        (0, 2),
+        (1, 3),
+        (1, 4),
+        (1, 5),
+        (2, 4),
+        (3, 6),
+        (4, 6),
+        (5, 6),
+        (5, 7),
+        (6, 2),
+    ]);
+    let transpose = VecGraph::from_arcs([
+        (1, 0),
+        (2, 0),
+        (3, 1),
+        (4, 1),
+        (5, 1),
+        (4, 2),
+        (6, 3),
+        (6, 4),
+        (6, 5),
+        (7, 5),
+        (2, 6),
+    ]);
     (graph, transpose)
 }
 
@@ -34,34 +68,37 @@ fn symm_graph() -> VecGraph {
 fn test_ess_diameter_only() -> Result<()> {
     let (graph, transpose) = directed_graph();
     let result = exact_sum_sweep::Diameter::run(&graph, &transpose, None, no_logging![]);
-    assert_eq!(result.diameter, 4);
+    assert_eq!(result.diameter, 3);
     Ok(())
 }
 
 #[test]
 fn test_ess_radius_only() -> Result<()> {
     let (graph, transpose) = directed_graph();
     let result = exact_sum_sweep::Radius::run(&graph, &transpose, None, no_logging![]);
-    assert_eq!(result.radius, 3);
+    assert_eq!(result.radius, 2);
     Ok(())
 }
 
 #[test]
 fn test_ess_all_forward() -> Result<()> {
     let (graph, transpose) = directed_graph();
     let result = exact_sum_sweep::AllForward::run(&graph, &transpose, None, no_logging![]);
-    assert_eq!(result.diameter, 4);
-    assert_eq!(result.radius, 3);
-    assert_eq!(result.forward_eccentricities.as_ref(), &[3, 3, 3, 4, 0]);
+    assert_eq!(result.diameter, 3);
+    assert_eq!(result.radius, 2);
+    assert_eq!(
+        result.forward_eccentricities.as_ref(),
+        &[3, 3, 2, 3, 2, 3, 2, 0]
+    );
     Ok(())
 }
 
 #[test]
 fn test_ess_radius_diameter() -> Result<()> {
     let (graph, transpose) = directed_graph();
     let result = exact_sum_sweep::RadiusDiameter::run(&graph, &transpose, None, no_logging![]);
-    assert_eq!(result.diameter, 4);
-    assert_eq!(result.radius, 3);
+    assert_eq!(result.diameter, 3);
+    assert_eq!(result.radius, 2);
     Ok(())
 }
 

webgraph/tests/test_breadth_first.rs

@@ -72,21 +72,17 @@ macro_rules! test_bfv_algo_seq {
             #[test]
             fn test_simple_graph() -> Result<()> {
                 let arcs = vec![
-                    (0, 0),
-                    (1, 0),
-                    (1, 2),
-                    (2, 1),
-                    (2, 3),
+                    (0, 1),
+                    (0, 2),
+                    (1, 3),
+                    (1, 4),
+                    (1, 5),
                     (2, 4),
-                    (2, 5),
-                    (3, 4),
-                    (4, 3),
-                    (5, 5),
+                    (3, 6),
+                    (4, 6),
                     (5, 6),
                     (5, 7),
-                    (5, 8),
-                    (6, 7),
-                    (8, 7),
+                    (6, 2),
                 ];
                 let graph = VecGraph::from_arcs(arcs);
                 let mut visit = $bfv(&graph);
@@ -222,21 +218,17 @@ macro_rules! test_bfv_algo_par {
             #[test]
             fn test_simple_graph() -> Result<()> {
                 let arcs = vec![
-                    (0, 0),
-                    (1, 0),
-                    (1, 2),
-                    (2, 1),
-                    (2, 3),
+                    (0, 1),
+                    (0, 2),
+                    (1, 3),
+                    (1, 4),
+                    (1, 5),
                     (2, 4),
-                    (2, 5),
-                    (3, 4),
-                    (4, 3),
-                    (5, 5),
+                    (3, 6),
+                    (4, 6),
                     (5, 6),
                     (5, 7),
-                    (5, 8),
-                    (6, 7),
-                    (8, 7),
+                    (6, 2),
                 ];
                 let graph = VecGraph::from_arcs(arcs);
                 let mut visit = $bfv(&graph);

webgraph/tests/test_visits_coverage.rs

@@ -328,7 +328,7 @@ fn test_dfs_interrupted_visit_stack() -> Result<()> {
     });
     assert_eq!(interrupted_node, std::ops::ControlFlow::Break(3));
     // After interruption at node 3 on chain 0->1->2->3->4, the stack
-    // yields the parents of nodes on the visit path (excluding the root),
+    // yields the parents of nodes on the visit path (except for the last one),
     // in reverse order. The interrupted node (3) was never pushed.
     let stack_nodes: Vec<usize> = visit.stack().collect();
     assert_eq!(stack_nodes, vec![1, 0]);
@@ -961,16 +961,6 @@ fn test_bfs_order_disconnected_graph() {
     assert_eq!(events[0].root, 0);
 }
 
-#[test]
-fn test_bfs_order_exact_size() {
-    use webgraph::visits::breadth_first;
-
-    let graph = VecGraph::from_arcs([(0, 1), (1, 2)]);
-    let mut visit = breadth_first::Seq::new(&graph);
-    let order = breadth_first::BfsOrder::new(&mut visit);
-    assert_eq!(order.len(), 3);
-}
-
 #[test]
 fn test_bfs_order_from_roots() -> Result<()> {
     use webgraph::visits::breadth_first;