From 37b01f2102dd51bee7a8226d8cf8e56320f27a66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jana=20D=C3=B6nszelmann?= <jana@donsz.nl>
Date: Fri, 2 Jan 2026 16:14:01 +0100
Subject: [PATCH] sort

---
 src/main.rs | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 48ac66b..db5c9db 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -326,18 +326,38 @@ impl<const TOWER_HEIGHT: usize> Game<TOWER_HEIGHT> {
                 .all(|x| x.is_some() && x == &tower.rings[0])
         }
 
-        let hash_state = |s: &[Tower<TOWER_HEIGHT>]| {
+        let hash_state = |towers: &[Tower<TOWER_HEIGHT>]| {
             let mut hasher = DefaultHasher::default();
 
-            let num_finished_towers = s.iter().filter(|i| tower_solved(*i)).count();
+            let num_finished_towers = towers.iter().filter(|i| tower_solved(*i)).count();
 
             num_finished_towers.hash(&mut hasher);
-
-            for x in s
+            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);
             }