From 31025964efd01e2f783e4825273610d183d2e047 Mon Sep 17 00:00:00 2001 From: Rhys Lloyd Date: Fri, 15 May 2026 10:43:07 -0700 Subject: [PATCH] try tableau moves first in KlondikeIter --- src/klondike.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/klondike.rs b/src/klondike.rs index bcb70f0..bb29c21 100644 --- a/src/klondike.rs +++ b/src/klondike.rs @@ -11,7 +11,6 @@ impl Default for KlondikeConfig { #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)] pub enum KlondikePileId { - Stock, Tableau0, Tableau1, Tableau2, @@ -24,12 +23,12 @@ pub enum KlondikePileId { Foundation1, Foundation2, Foundation3, + Stock, } impl KlondikePileId { fn next(self) -> Option { use KlondikePileId::*; Some(match self { - Stock => Tableau0, Tableau0 => Tableau1, Tableau1 => Tableau2, Tableau2 => Tableau3, @@ -41,7 +40,8 @@ impl KlondikePileId { Foundation0 => Foundation1, Foundation1 => Foundation2, Foundation2 => Foundation3, - Foundation3 => return None, + Foundation3 => Stock, + Stock => return None, }) } } @@ -148,8 +148,8 @@ impl KlondikeIter { fn new() -> Self { Self { instruction: Some(KlondikeInstruction { - src: KlondikePileId::Stock, - dst: KlondikePileId::Stock, + src: KlondikePileId::Tableau0, + dst: KlondikePileId::Tableau1, }), } } @@ -192,7 +192,6 @@ impl Klondike { let state = KlondikeState { piles: [ - stock, t0, t1, t2, @@ -205,6 +204,7 @@ impl Klondike { Pile::new(), Pile::new(), Pile::new(), + stock, ], }; Self { config, state }