Put different configurations together in benchmark

benches/benchmark.rs

@@ -1,23 +1,35 @@
-use criterion::{BenchmarkId, measurement::Measurement};
-use criterion::{criterion_group, criterion_main, Criterion, Throughput, BenchmarkGroup};
+use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion, Throughput};
 use gntag::agent::{Agent, SimpleAgent};
 use gntag::world::ActualWorld;
 
-fn world<M: Measurement>(mut group: BenchmarkGroup<M>, validate: bool) {
+fn get_world(width: isize, spacing: usize, validate: bool) -> ActualWorld {
+  let mut agents = vec![];
+  for x in (0..width).step_by(spacing) {
+    for y in (0..width).step_by(spacing) {
+      agents.push(((x, y).into(), Box::new(SimpleAgent) as Box<dyn Agent>));
+    }
+  }
+  ActualWorld::new((width, width).into(), agents, validate)
+}
+
+fn world(c: &mut Criterion) {
+  let mut group = c.benchmark_group("world");
   let width: isize = 1000;
-  for spacing in (50..100).step_by(10) {
+  for spacing in (50..=100).step_by(25) {
     group.throughput(Throughput::Elements((width / spacing).pow(2) as u64));
     group.bench_with_input(
-      BenchmarkId::from_parameter(spacing),
+      BenchmarkId::new("validating", spacing),
       &spacing,
       |b, &spacing| {
-        let mut agents: Vec<(_, Box<dyn Agent>)> = vec![];
-        for x in (0..width).step_by(spacing as usize) {
-          for y in (0..width).step_by(spacing as usize) {
-            agents.push(((x, y).into(), Box::new(SimpleAgent)));
-          }
-        }
-        let mut world = ActualWorld::new((width, width).into(), agents, validate);
+        let mut world = get_world(width, spacing as usize, true);
+        b.iter(|| world.do_step());
+      },
+    );
+    group.bench_with_input(
+      BenchmarkId::new("non-validating", spacing),
+      &spacing,
+      |b, &spacing| {
+        let mut world = get_world(width, spacing as usize, false);
         b.iter(|| world.do_step());
       },
     );
@@ -25,17 +37,7 @@ fn world<M: Measurement>(mut group: BenchmarkGroup<M>, validate: bool) {
   group.finish();
 }
 
-fn world_validating(c: &mut Criterion) {
-  let group = c.benchmark_group("world_validating");
-  world(group, true)
-}
-
-fn world_nonvalidating(c: &mut Criterion) {
-  let group = c.benchmark_group("world_nonvalidating");
-  world(group, false)
-}
-
-criterion_group!(benches, world_validating, world_nonvalidating);
+criterion_group!(benches, world);
 criterion_main!(benches);
 
 // 5000/1000 ->     9,993