Skip to content

Commit 7ec91db

Browse files
committed
clean up rnd seed
1 parent de430c7 commit 7ec91db

3 files changed

Lines changed: 14 additions & 11 deletions

File tree

src/test_utils.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ use fastpfor::{
2525
FastPFor128, FastPFor256, FastPForBlock128, FastPForBlock256, JustCopy, VariableByte,
2626
};
2727

28-
const SEED: u64 = 456;
28+
pub const RNG_SEED: u64 = 456;
2929

3030
// ---------------------------------------------------------------------------
3131
// Generic codec helpers
@@ -165,12 +165,12 @@ mod rust_bench {
165165
use rand::rngs::StdRng;
166166
use rand::{RngExt as _, SeedableRng};
167167

168-
use super::{BlockCodec, block_compress};
168+
use super::{BlockCodec, RNG_SEED, block_compress};
169169

170170
type DataGeneratorFn = fn(usize) -> Vec<u32>;
171171

172172
fn generate_uniform_data_from_range(size: usize, value_range: Range<u32>) -> Vec<u32> {
173-
let mut rng = StdRng::seed_from_u64(super::SEED);
173+
let mut rng = StdRng::seed_from_u64(RNG_SEED);
174174
(0..size)
175175
.map(|_| rng.random_range(value_range.clone()))
176176
.collect()
@@ -185,7 +185,7 @@ mod rust_bench {
185185
}
186186

187187
fn generate_clustered_data(size: usize) -> Vec<u32> {
188-
let mut rng = StdRng::seed_from_u64(super::SEED);
188+
let mut rng = StdRng::seed_from_u64(RNG_SEED);
189189
let mut base = 0u32;
190190
(0..size)
191191
.map(|_| {
@@ -202,7 +202,7 @@ mod rust_bench {
202202
}
203203

204204
fn generate_sparse_data(size: usize) -> Vec<u32> {
205-
let mut rng = StdRng::seed_from_u64(super::SEED);
205+
let mut rng = StdRng::seed_from_u64(RNG_SEED);
206206
(0..size)
207207
.map(|_| {
208208
if rng.random_bool(0.9) {
@@ -215,7 +215,7 @@ mod rust_bench {
215215
}
216216

217217
fn generate_constant_data(size: usize) -> Vec<u32> {
218-
vec![super::SEED as u32; size]
218+
vec![RNG_SEED as u32; size]
219219
}
220220

221221
fn generate_geometric_data(size: usize) -> Vec<u32> {

tests/basic_tests.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use fastpfor::{BlockCodec, FastPForBlock128, FastPForBlock256, slice_to_blocks};
1010
use rand::rngs::StdRng;
1111
use rand::{RngExt as _, SeedableRng};
1212

13-
use crate::test_utils::{block_compress, block_roundtrip_all, roundtrip_all};
13+
use crate::test_utils::{RNG_SEED, block_compress, block_roundtrip_all, roundtrip_all};
1414

1515
mod common;
1616

@@ -51,9 +51,8 @@ fn test_increasing_sequence() {
5151

5252
#[test]
5353
fn test_random_numbers() {
54-
let data: Vec<u32> = (0..65536)
55-
.map(|_| StdRng::seed_from_u64(123456).random())
56-
.collect();
54+
let mut rng = StdRng::seed_from_u64(RNG_SEED);
55+
let data: Vec<u32> = (0..65536).map(|_| rng.random()).collect();
5756
roundtrip_all(&data);
5857
}
5958

tests/common.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@
33
#![cfg(any(feature = "rust", feature = "cpp"))]
44
#![allow(dead_code, reason = "This file is shared by several test modules")]
55

6+
#[path = "../src/test_utils.rs"]
7+
mod test_utils;
8+
69
use rand::rngs::StdRng;
710
use rand::{RngExt as _, SeedableRng as _};
11+
use test_utils::RNG_SEED;
812

913
/// Returns various input sizes to test codec behavior (multiples of 128).
1014
#[must_use]
@@ -15,7 +19,7 @@ pub fn test_input_sizes() -> Vec<usize> {
1519
/// Generates test data vectors of size `n` with various patterns.
1620
#[must_use]
1721
pub fn get_test_cases(n: usize) -> Vec<Vec<u32>> {
18-
let mut rng = StdRng::seed_from_u64(14);
22+
let mut rng = StdRng::seed_from_u64(RNG_SEED);
1923

2024
vec![
2125
// Zeroes

0 commit comments

Comments
 (0)