jana/hanoigame
2
0
Fork 1
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Compare commits

base: jana:37b01f2102dd51bee7a8226d8cf8e56320f27a66
Branches Tags
jana:main
..
compare: jana:50f7dd20f6b550e72d67b0e3882e6d2e61d039ce
Branches Tags
jana:main

No commits in common. "37b01f2102dd51bee7a8226d8cf8e56320f27a66" and "50f7dd20f6b550e72d67b0e3882e6d2e61d039ce" have entirely different histories.
37b01f2102 ... 50f7dd20f6

1 changed files with 3 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/main.rs
View file

@ -280,13 +280,6 @@ impl<const TOWER_HEIGHT: usize> Game<TOWER_HEIGHT> {
continue; 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); let m = Move::new(from_tower, to_tower);
if self.try_make_move(m, true).is_ok() { if self.try_make_move(m, true).is_ok() {
res.push(m); res.push(m);
@ -319,45 +312,10 @@ impl<const TOWER_HEIGHT: usize> Game<TOWER_HEIGHT> {
} }
} }
fn tower_solved<const TOWER_HEIGHT: usize>(tower: &Tower<TOWER_HEIGHT>) -> bool { let hash_state = |s: &[Tower<TOWER_HEIGHT>]| {
tower
.rings
.iter()
.all(|x| x.is_some() && x == &tower.rings[0])
}
let hash_state = |towers: &[Tower<TOWER_HEIGHT>]| {
let mut hasher = DefaultHasher::default(); let mut hasher = DefaultHasher::default();
let num_finished_towers = towers.iter().filter(|i| tower_solved(*i)).count(); for x in s.iter().filter(|i| i.height() != 0).enumerate() {
num_finished_towers.hash(&mut hasher);
let mut filtered_towers = towers
.iter()
.filter(|i| !tower_solved(i) && i.height() != 0)
.enumerate()
.collect::<Vec<_>>();
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() {
x.hash(&mut hasher); x.hash(&mut hasher);
} }
@ -804,7 +762,7 @@ fn main() -> io::Result<()> {
let mut g = GameGenerator { let mut g = GameGenerator {
num_extra_towers: 2, num_extra_towers: 2,
num_ring_types: 16, num_ring_types: 13,
} }
.highest_burried_score::<4>(&seed); .highest_burried_score::<4>(&seed);