stefiosif/rota
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Shuffle once and keep order, use SmallRng

Browse Source 
time:   [98.196 µs 100.64 µs 103.56 µs]
change: [−13.633% −10.629% −7.6947%] (p = 0.00 < 0.05)
This commit is contained in:
stefiosif
2026-02-10 22:46:31 +02:00
parent f84d812602
commit c291328bfa
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src-tauri/src/scheduler.rs
View File

@@ -11,7 +11,7 @@ use crate::{
}; };
use log::info; use log::info;
use rand::Rng; use rand::{rngs::SmallRng, seq::SliceRandom, SeedableRng};
use rayon::{ use rayon::{
current_thread_index, current_thread_index,
iter::{IntoParallelRefIterator, ParallelIterator}, iter::{IntoParallelRefIterator, ParallelIterator},
@@ -132,13 +132,13 @@ impl Scheduler {
return self.search(schedule, tracker, slot.next(), solved_in_thread); return self.search(schedule, tracker, slot.next(), solved_in_thread);
} }
// sort candidates by current workload, add rng for tie breakers let mut rng = SmallRng::from_rng(&mut rand::rng());
let mut valid_resident_ids = self.valid_residents(slot, schedule); let mut valid_resident_ids = self.valid_residents(slot, schedule);
valid_resident_ids.sort_unstable_by_key(|res_id| { valid_resident_ids.shuffle(&mut rng);
valid_resident_ids.sort_by_key(|res_id| {
let type_count = tracker.get_type_count(res_id, slot.shift_type()); let type_count = tracker.get_type_count(res_id, slot.shift_type());
let workload = tracker.current_workload(res_id); let workload = tracker.current_workload(res_id);
let tie_breaker: f64 = rand::rng().random(); (type_count, workload)
(type_count, workload, (tie_breaker * 1000.0) as usize)
}); });
for id in valid_resident_ids { for id in valid_resident_ids {