Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions crates/solverforge-solver/src/heuristic/selector/list_ruin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -224,16 +224,23 @@ where
let max_ruin = self.max_ruin_count;
let moves_count = self.moves_per_step;

let non_empty_entities: Vec<(usize, usize)> = (0..total_entities)
.filter_map(|entity_idx| {
let len = list_len(solution, entity_idx);
(len > 0).then_some((entity_idx, len))
})
.collect();

// Pre-generate moves using RNG (empty if no entities)
let mut rng = self.rng.borrow_mut();
let moves: Vec<ListRuinMove<S, V>> = if total_entities == 0 {
let moves: Vec<ListRuinMove<S, V>> = if non_empty_entities.is_empty() {
Vec::new()
} else {
(0..moves_count)
.filter_map(|_| {
// Pick a random entity
let entity_idx = rng.random_range(0..total_entities);
let list_length = list_len(solution, entity_idx);
let (entity_idx, list_length) =
non_empty_entities[rng.random_range(0..non_empty_entities.len())];

if list_length == 0 {
return None;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ fn empty_solution_yields_no_moves() {
}

#[test]
fn empty_list_yields_no_moves_for_that_entity() {
fn empty_lists_should_not_reduce_moves_per_step() {
let director = create_director(vec![vec![], vec![1, 2, 3]]);

let selector = ListRuinMoveSelector::<VrpSolution, i32>::new(
Expand All @@ -154,10 +154,17 @@ fn empty_list_yields_no_moves_for_that_entity() {

let moves: Vec<_> = selector.iter_moves(&director).collect();

assert_eq!(
moves.len(),
10,
"empty routes should not consume moves_per_step attempts when non-empty routes exist"
);

// Some moves may be None due to empty list selection
// All returned moves should be valid
for m in &moves {
assert!(m.ruin_count() >= 1);
assert_eq!(m.entity_index(), 1);
assert!((1..=2).contains(&m.ruin_count()));
}
}

Expand Down
Loading