Skip to content

Commit 6123bc8

Browse files
committed
Simplified tests
1 parent a33fd80 commit 6123bc8

File tree

1 file changed

+11
-26
lines changed

1 file changed

+11
-26
lines changed

webgraph/src/graphs/csr_graph.rs

Lines changed: 11 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,11 @@ pub struct LenderImpl<I: Iterator<Item = usize>, D: Iterator<Item = usize>> {
264264
successors_iter: D,
265265
}
266266

267+
unsafe impl<I: Iterator<Item = usize>, D: Iterator<Item = usize>> SortedLender
268+
for LenderImpl<I, D>
269+
{
270+
}
271+
267272
impl<'succ, I, D> NodeLabelsLender<'succ> for LenderImpl<I, D>
268273
where
269274
I: Iterator<Item = usize>,
@@ -367,32 +372,12 @@ mod test {
367372
let g = VecGraph::from_arcs(arcs.iter().copied());
368373

369374
let csr = <CsrGraph>::from_seq_graph(&g);
370-
dbg!(&csr);
371-
//super::labels::eq(&g, &csr);
372-
373-
//let csr = CompressedCsrGraph::from_graph(&g);
374-
//check_graph_equivalence(&g, &csr);
375-
}
375+
labels::check_impl(&csr);
376+
// We should be able to use eq_sorted
377+
graph::eq(&g, &csr);
376378

377-
fn check_graph_equivalence(g1: impl RandomAccessGraph, g2: impl RandomAccessGraph) {
378-
assert_eq!(g1.num_nodes(), g2.num_nodes());
379-
assert_eq!(g1.num_arcs(), g2.num_arcs());
380-
for node in 0..g1.num_nodes() {
381-
let labels1: Vec<_> = g1.successors(node).into_iter().collect();
382-
let labels2: Vec<_> = g2.successors(node).into_iter().collect();
383-
assert_eq!(labels1, labels2);
384-
}
385-
for start in 0..g1.num_nodes() {
386-
let mut iter1 = g1.iter_from(start);
387-
let mut iter2 = g2.iter_from(start);
388-
389-
while let Some(((n1, succ1), (n2, succ2))) = iter1.next().zip(iter2.next()) {
390-
assert_eq!(n1, n2);
391-
assert_eq!(
392-
succ1.into_iter().collect::<Vec<_>>(),
393-
succ2.into_iter().collect::<Vec<_>>()
394-
);
395-
}
396-
}
379+
let csr = CompressedCsrGraph::from_graph(&g);
380+
/*graph::eq(&g, &csr);
381+
labels::check_impl(&csr);*/
397382
}
398383
}

0 commit comments

Comments
 (0)