diff --git a/src/main.rs b/src/main.rs index db5c9db..d302c5e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -280,13 +280,6 @@ impl Game { continue; } - let rings = self.towers[from_tower].rings; - if rings[1..].iter().all(|i| i == &rings[0]) - && self.towers[to_tower].rings[0].is_none() - { - continue; - } - let m = Move::new(from_tower, to_tower); if self.try_make_move(m, true).is_ok() { res.push(m); @@ -319,45 +312,10 @@ impl Game { } } - fn tower_solved(tower: &Tower) -> bool { - tower - .rings - .iter() - .all(|x| x.is_some() && x == &tower.rings[0]) - } - - let hash_state = |towers: &[Tower]| { + let hash_state = |s: &[Tower]| { let mut hasher = DefaultHasher::default(); - let num_finished_towers = towers.iter().filter(|i| tower_solved(*i)).count(); - - num_finished_towers.hash(&mut hasher); - let mut filtered_towers = towers - .iter() - .filter(|i| !tower_solved(i) && i.height() != 0) - .enumerate() - .collect::>(); - - filtered_towers.sort_by_cached_key(|(index, tower)| { - let mut rings = [0; TOWER_HEIGHT]; - - let mut count = 0; - for (idx, ring) in tower.rings.iter().copied().enumerate() { - let Some(ring) = ring else { break }; - - if rings[idx] == 0 { - count += 1; - for (j, ring2) in tower.rings[idx..].iter().copied().enumerate() { - if ring2 == Some(ring) { - rings[j] = count; - } - } - } - } - (rings, *index) - }); - - for x in filtered_towers.into_iter().map(|(_, x)| x).enumerate() { + for x in s.iter().filter(|i| i.height() != 0).enumerate() { x.hash(&mut hasher); } @@ -804,7 +762,7 @@ fn main() -> io::Result<()> { let mut g = GameGenerator { num_extra_towers: 2, - num_ring_types: 16, + num_ring_types: 13, } .highest_burried_score::<4>(&seed);