fix: upgrade everywhere to rand 0.9
This commit is contained in:
parent
bb0a08a427
commit
8911e582d8
10 changed files with 65 additions and 97 deletions
|
|
@ -190,7 +190,7 @@ impl<R: Rng + std::fmt::Debug> LSEQBase64<R> {
|
|||
trace!("Current carry_flag: {}", borrow_flag);
|
||||
|
||||
if self.strategies.len() <= depth {
|
||||
let new_strategy = self.rng.gen_bool(0.5);
|
||||
let new_strategy = self.rng.random_bool(0.5);
|
||||
trace!("BRANCH: Generating new strategy for depth {}: {} (+ strategy: {})",
|
||||
depth, new_strategy, new_strategy);
|
||||
self.strategies.push(new_strategy);
|
||||
|
|
@ -245,18 +245,18 @@ impl<R: Rng + std::fmt::Debug> LSEQBase64<R> {
|
|||
let step = std::cmp::min(BOUNDARY, interval);
|
||||
|
||||
let allocated_value = if self.strategies[depth] {
|
||||
let delta = self.rng.gen_range(1..=step);
|
||||
let delta = self.rng.random_range(1..=step);
|
||||
trace!("Space allocation: interval={}, step={}, delta={}", interval, step, delta);
|
||||
let val = p_val + delta;
|
||||
trace!("BRANCH: Using + strategy, allocated_value = p_val + delta = {} + {} = {}",
|
||||
trace!("BRANCH: Using + strategy, allocated_value = p_val + delta = {} + {} = {}",
|
||||
p_val, delta, val);
|
||||
val
|
||||
} else {
|
||||
let delta = if borrow_flag {
|
||||
//self.rng.gen_range(0..step)
|
||||
self.rng.gen_range(1..=step)
|
||||
//self.rng.random_range(0..step)
|
||||
self.rng.random_range(1..=step)
|
||||
} else {
|
||||
self.rng.gen_range(1..=step)
|
||||
self.rng.random_range(1..=step)
|
||||
};
|
||||
trace!("Space allocation: interval={}, step={}, delta={}", interval, step, delta);
|
||||
let val = q_val - delta;
|
||||
|
|
|
|||
|
|
@ -187,7 +187,7 @@ impl<R: Rng> ReferenceLSEQ<R> {
|
|||
trace!("Current carry_flag: {}", borrow_flag);
|
||||
|
||||
if self.strategies.len() <= depth {
|
||||
let new_strategy = self.rng.gen_bool(0.5);
|
||||
let new_strategy = self.rng.random_bool(0.5);
|
||||
trace!("BRANCH: Generating new strategy for depth {}: {} (+ strategy: {})",
|
||||
depth, new_strategy, new_strategy);
|
||||
self.strategies.push(new_strategy);
|
||||
|
|
@ -241,17 +241,17 @@ impl<R: Rng> ReferenceLSEQ<R> {
|
|||
let step = std::cmp::min(BOUNDARY, interval);
|
||||
|
||||
let allocated_value = if self.strategies[depth] {
|
||||
let delta = self.rng.gen_range(1..=step);
|
||||
let delta = self.rng.random_range(1..=step);
|
||||
trace!("Space allocation: interval={}, step={}, delta={}", interval, step, delta);
|
||||
let val = p_val + delta;
|
||||
trace!("BRANCH: Using + strategy, allocated_value = p_val + delta = {} + {} = {}",
|
||||
trace!("BRANCH: Using + strategy, allocated_value = p_val + delta = {} + {} = {}",
|
||||
p_val, delta, val);
|
||||
val
|
||||
} else {
|
||||
let delta = if borrow_flag {
|
||||
self.rng.gen_range(1..=step)
|
||||
self.rng.random_range(1..=step)
|
||||
} else {
|
||||
self.rng.gen_range(1..=step)
|
||||
self.rng.random_range(1..=step)
|
||||
};
|
||||
trace!("Space allocation: interval={}, step={}, delta={}", interval, step, delta);
|
||||
let val = q_val - delta;
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ fn generate_insertion_positions(count: usize, rng: &mut StdRng) -> Vec<usize> {
|
|||
positions.push(0); // First element always goes at position 0
|
||||
} else {
|
||||
// Insert after position 0 to i-1 (current list has i elements)
|
||||
positions.push(rng.gen_range(0..i));
|
||||
positions.push(rng.random_range(0..i));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue