Skip to content

Commit d90509c

Browse files
committed
Fixed benchmark
1 parent 930ccdf commit d90509c

File tree

2 files changed

+34
-9
lines changed

2 files changed

+34
-9
lines changed

raphtory-benchmark/benches/base.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use criterion::{criterion_group, criterion_main, Criterion, Throughput};
22
use raphtory::{graph_loader::lotr_graph::lotr_graph, prelude::*};
3+
use raphtory_api::core::storage::timeindex::AsTime;
34
use raphtory_benchmark::common::{
45
bootstrap_graph, run_graph_ops_benches, run_large_ingestion_benchmarks,
56
run_proto_decode_benchmark, run_proto_encode_benchmark,
@@ -37,7 +38,7 @@ pub fn base(c: &mut Criterion) {
3738
for t in edge.history() {
3839
layered_graph
3940
.add_edge(
40-
t,
41+
t.t(),
4142
edge.src().name().clone(),
4243
edge.dst().name().clone(),
4344
NO_PROPS,

raphtory-benchmark/src/common/mod.rs

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,10 @@ pub fn run_analysis_benchmarks<F, G>(
301301

302302
bench(group, "has_edge_existing", parameter, |b: &mut Bencher| {
303303
let mut rng = rand::thread_rng();
304-
let (src, dst) = edges.iter().choose(&mut rng).expect("has_edge_existing: non-empty graph (graph().edges().iter() is empty)");
304+
let (src, dst) = edges
305+
.iter()
306+
.choose(&mut rng)
307+
.expect("has_edge_existing: non-empty graph (graph().edges().iter() is empty)");
305308
b.iter(|| graph.has_edge(src, dst))
306309
});
307310

@@ -362,7 +365,10 @@ pub fn run_analysis_benchmarks<F, G>(
362365

363366
bench(group, "has_node_existing", parameter, |b: &mut Bencher| {
364367
let mut rng = rand::thread_rng();
365-
let v = nodes.iter().choose(&mut rng).expect("has_node_existing: non-empty graph (graph().nodes().id().iter() is empty)");
368+
let v = nodes
369+
.iter()
370+
.choose(&mut rng)
371+
.expect("has_node_existing: non-empty graph (graph().nodes().id().iter() is empty)");
366372
b.iter(|| graph.has_node(v))
367373
});
368374

@@ -482,8 +488,14 @@ pub fn run_graph_ops_benches(
482488
// graph windowed
483489
let group_name = format!("{graph_name}_window_10");
484490
let mut graph_window_group_10 = c.benchmark_group(group_name);
485-
let latest = graph.latest_time().expect("windowed graph latest time error: non-empty graph").t();
486-
let earliest = graph.earliest_time().expect("windowed graph earliest time error: non-empty graph").t();
491+
let latest = graph
492+
.latest_time()
493+
.expect("windowed graph latest time error: non-empty graph")
494+
.t();
495+
let earliest = graph
496+
.earliest_time()
497+
.expect("windowed graph earliest time error: non-empty graph")
498+
.t();
487499
let start = latest - (latest - earliest) / 10;
488500
// graph_window_group_10.sample_size(10);
489501
let make_graph = || graph.window(start, latest + 1);
@@ -535,8 +547,14 @@ pub fn run_graph_ops_benches(
535547
let graph = layered_graph;
536548
let group_name = format!("{graph_name}_window_50_layered");
537549
let mut graph_window_layered_group_50 = c.benchmark_group(group_name);
538-
let latest = graph.latest_time().expect("layered windowed graph latest time error: non-empty graph").t();
539-
let earliest = graph.earliest_time().expect("layered windowed graph earliest time error: non-empty graph").t();
550+
let latest = graph
551+
.latest_time()
552+
.expect("layered windowed graph latest time error: non-empty graph")
553+
.t();
554+
let earliest = graph
555+
.earliest_time()
556+
.expect("layered windowed graph earliest time error: non-empty graph")
557+
.t();
540558
let start = latest - (latest - earliest) / 2;
541559
let make_graph = || {
542560
graph
@@ -556,8 +574,14 @@ pub fn run_graph_ops_benches(
556574

557575
let group_name = format!("{graph_name}_persistent_window_50_layered");
558576
let mut graph_window_layered_group_50 = c.benchmark_group(group_name);
559-
let latest = graph.latest_time().expect("layered windowed persistent graph latest time error: non-empty graph").t();
560-
let earliest = graph.earliest_time().expect("layered windowed persistent graph earliest time error: non-empty graph").t();
577+
let latest = graph
578+
.latest_time()
579+
.expect("layered windowed persistent graph latest time error: non-empty graph")
580+
.t();
581+
let earliest = graph
582+
.earliest_time()
583+
.expect("layered windowed persistent graph earliest time error: non-empty graph")
584+
.t();
561585
let start = latest - (latest - earliest) / 2;
562586
let make_graph = || {
563587
graph

0 commit comments

Comments
 (0)