aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAria Shrimpton <me@aria.rip>2024-01-23 12:56:17 +0000
committerAria Shrimpton <me@aria.rip>2024-01-23 12:56:17 +0000
commit2ff1d75882fedf177b2e429a4b217aa4a11b9351 (patch)
tree407edb7c4b12196939eea03f4656b6708a3a53cf
parenta8967d7d399b2324d5a9380d933d038e9159bb6b (diff)
benchmark fixes
-rw-r--r--src/crates/benchmarker/src/container.rs12
-rw-r--r--src/crates/candelabra/src/cost/benchmark.rs3
2 files changed, 7 insertions, 8 deletions
diff --git a/src/crates/benchmarker/src/container.rs b/src/crates/benchmarker/src/container.rs
index f1c9948..004c639 100644
--- a/src/crates/benchmarker/src/container.rs
+++ b/src/crates/benchmarker/src/container.rs
@@ -1,11 +1,11 @@
-use primrose_library::traits::{Container, Indexable};
+use primrose_library::traits::Container;
use rand::{distributions::Standard, prelude::Distribution, random, thread_rng, Rng};
use crate::{benchmark_op, print_result};
pub fn benchmark_container<T, E>(ns: &[usize])
where
- T: Container<E> + Indexable<E> + Default + Clone,
+ T: Container<E> + Default + Clone,
E: Copy,
Standard: Distribution<E>,
{
@@ -19,7 +19,7 @@ where
fn scenario_populate<T, E>(n: usize)
where
- T: Container<E> + Indexable<E> + Default + Clone,
+ T: Container<E> + Default + Clone,
E: Copy,
Standard: Distribution<E>,
{
@@ -42,7 +42,7 @@ where
fn scenario_contains<T, E>(n: usize)
where
- T: Container<E> + Indexable<E> + Default + Clone,
+ T: Container<E> + Default + Clone,
E: Copy,
Standard: Distribution<E>,
{
@@ -76,7 +76,7 @@ where
fn scenario_remove<T, E>(n: usize)
where
- T: Container<E> + Indexable<E> + Default + Clone,
+ T: Container<E> + Default + Clone,
E: Copy,
Standard: Distribution<E>,
{
@@ -110,7 +110,7 @@ where
fn scenario_clear<T, E>(n: usize)
where
- T: Container<E> + Indexable<E> + Default + Clone,
+ T: Container<E> + Default + Clone,
E: Copy,
Standard: Distribution<E>,
{
diff --git a/src/crates/candelabra/src/cost/benchmark.rs b/src/crates/candelabra/src/cost/benchmark.rs
index bafe9bd..48c7a84 100644
--- a/src/crates/candelabra/src/cost/benchmark.rs
+++ b/src/crates/candelabra/src/cost/benchmark.rs
@@ -25,8 +25,7 @@ pub const ELEM_TYPE: &str = "usize";
/// String representation of the array of N values we use for benchmarking
pub const NS: &str = "[
- 64, 128, 256, 512, 1024, 2048, 3072, 4096, 5120, 6144, 7168, 8192, 16384, 24576, 32768,
- 40960, 49152, 57344, 65536,
+ 64, 128, 256, 512, 2048, 5120, 16384, 32768, 65536,
]";
/// Results for a whole suite of benchmarks