format

This reverts commit 5a52f2ab7a.

Cargo.lock

@@ -11,8 +11,8 @@ checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
 [[package]]
 name = "arrayvec"
 version = "0.7.6"
-source = "sparse+https://git.aleshym.co/api/packages/Quaternions/cargo/"
+source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "813440870d646c57c222c1d713dc4e3ddcb2919c3801564d767d85d7bf2afee4"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "bitflags"

card_game/Cargo.toml

@@ -9,7 +9,7 @@ authors = ["Rhys Lloyd <krakow20@gmail.com>"]
 keywords = ["card", "cards", "solitaire", "klondike"]
 
 [dependencies]
-arrayvec = { version = "0.7.6", registry = "Quaternions", features = ["len_u8"], default-features = false }
+arrayvec = "0.7.6"
 
 [lints]
 workspace = true

card_game/src/lib.rs

@@ -321,18 +321,29 @@ impl<S> SessionStats<S> {
 	}
 }
 
-pub struct Session<G: Game> {
+#[derive(Clone)]
+pub struct Session<G: Game>
+where
+	G::Config: Clone,
+	G::Instruction: Clone,
+{
 	stats: SessionStats<G::Stats>,
 	config: G::Config,
 	state: SessionState<G>,
 }
 #[derive(Clone, Eq, Hash, PartialEq)]
-pub struct SessionState<G: Game> {
+pub struct SessionState<G: Game>
+where
+	G::Instruction: Clone,
+{
 	seed: G,
 	state: G,
 	history: Vec<G::Instruction>,
 }
-impl<G: Game + Clone> SessionState<G> {
+impl<G: Game + Clone> SessionState<G>
+where
+	G::Instruction: Clone,
+{
 	fn new(state: G) -> Self {
 		Self {
 			seed: state.clone(),
@@ -345,6 +356,7 @@ impl<G: Game> Session<G>
 where
 	G: Clone + Eq + core::hash::Hash,
 	G::Stats: Clone + Default,
+	G::Config: Clone,
 	G::Instruction: Clone + Eq + core::hash::Hash,
 {
 	pub fn new(state: G, config: G::Config) -> Self {
@@ -389,6 +401,30 @@ where
 	pub fn is_win(&self) -> bool {
 		self.state.is_win()
 	}
+	pub fn is_winnable(&self) -> Option<Vec<G::Instruction>> {
+		let mut state_moves = std::collections::HashMap::new();
+		let mut state = self.clone();
+		while !state.is_win() {
+			// Continue existing iterator if it exists
+			let it = state_moves
+				.entry(state.state().clone())
+				.or_insert_with(|| state.state().possible_instructions());
+
+			// Run one possible move
+			if let Some(instruction) = it.next() {
+				state.process_instruction(instruction);
+				continue;
+			}
+
+			// No more moves. If we can't undo we're done
+			if state.history().is_empty() {
+				return None;
+			} else {
+				state.undo();
+			}
+		}
+		Some(state.state.history)
+	}
 }
 impl<G: Game> Game for SessionState<G>
 where

klondike-cli/src/main.rs

@@ -4,8 +4,8 @@ use klondike::{
 	KlondikePile, KlondikePileStack, KlondikeStats, SkipCards, Tableau, TableauStack,
 };
 
-// #[cfg(test)]
+#[cfg(test)]
-// mod test;
+mod test;
 
 use std::fmt::Display;
 struct Displayed<T>(T);

klondike-cli/src/test.rs

@@ -1,5 +1,5 @@
-use klondike::Klondike;
 use card_game::Session;
+use klondike::Klondike;
 #[test]
 fn test_is_winnable() {
 	// is winnable

klondike/README.md

@@ -17,8 +17,8 @@ let mut session = Session::new_default(game);
 while let Some(instruction) = session.state().get_auto_move() {
 	session.process_instruction(instruction);
 
-	// quit after 200 moves or win
+	// quit after 1000 moves
-	if session.is_win() || 200 < session.stats().stats().moves() {
+	if 1000 < session.stats().stats().moves() {
 		break;
 	}
 }

klondike/src/lib.rs

@@ -137,6 +137,7 @@ impl From<Foundation> for KlondikePile {
 	}
 }
 
+#[repr(u8)]
 #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
 pub enum SkipCards {
 	Skip0,
@@ -365,26 +366,15 @@ impl KlondikeState {
 	pub const fn tableau7(&self) -> &Pile<6, 13> {
 		&self.tableau7
 	}
-	pub fn tableau_face_down_cards(&self, tableau: Tableau) -> &[Card] {
+	pub fn is_tableau_face_down_empty(&self, tableau: Tableau) -> bool {
 		match tableau {
-			Tableau::Tableau1 => self.tableau1.face_down(),
+			Tableau::Tableau1 => self.tableau1.face_down().is_empty(),
-			Tableau::Tableau2 => self.tableau2.face_down(),
+			Tableau::Tableau2 => self.tableau2.face_down().is_empty(),
-			Tableau::Tableau3 => self.tableau3.face_down(),
+			Tableau::Tableau3 => self.tableau3.face_down().is_empty(),
-			Tableau::Tableau4 => self.tableau4.face_down(),
+			Tableau::Tableau4 => self.tableau4.face_down().is_empty(),
-			Tableau::Tableau5 => self.tableau5.face_down(),
+			Tableau::Tableau5 => self.tableau5.face_down().is_empty(),
-			Tableau::Tableau6 => self.tableau6.face_down(),
+			Tableau::Tableau6 => self.tableau6.face_down().is_empty(),
-			Tableau::Tableau7 => self.tableau7.face_down(),
+			Tableau::Tableau7 => self.tableau7.face_down().is_empty(),
-		}
-	}
-	pub fn tableau_face_up_cards(&self, tableau: Tableau) -> &[Card] {
-		match tableau {
-			Tableau::Tableau1 => self.tableau1.face_up(),
-			Tableau::Tableau2 => self.tableau2.face_up(),
-			Tableau::Tableau3 => self.tableau3.face_up(),
-			Tableau::Tableau4 => self.tableau4.face_up(),
-			Tableau::Tableau5 => self.tableau5.face_up(),
-			Tableau::Tableau6 => self.tableau6.face_up(),
-			Tableau::Tableau7 => self.tableau7.face_up(),
 		}
 	}
 	pub fn stack_bottom_card(&self, src: KlondikePileStack) -> Option<&Card> {
@@ -392,7 +382,15 @@ impl KlondikeState {
 			KlondikePileStack::Tableau(TableauStack {
 				tableau,
 				skip_cards,
-			}) => self.tableau_face_up_cards(tableau).get(skip_cards as usize),
+			}) => match tableau {
+				Tableau::Tableau1 => self.tableau1.face_up().get(skip_cards as usize),
+				Tableau::Tableau2 => self.tableau2.face_up().get(skip_cards as usize),
+				Tableau::Tableau3 => self.tableau3.face_up().get(skip_cards as usize),
+				Tableau::Tableau4 => self.tableau4.face_up().get(skip_cards as usize),
+				Tableau::Tableau5 => self.tableau5.face_up().get(skip_cards as usize),
+				Tableau::Tableau6 => self.tableau6.face_up().get(skip_cards as usize),
+				Tableau::Tableau7 => self.tableau7.face_up().get(skip_cards as usize),
+			},
 			KlondikePileStack::Foundation(foundation) => {
 				self.foundations[foundation as usize].last()
 			}
@@ -401,7 +399,15 @@ impl KlondikeState {
 	}
 	pub fn top_card<S: Into<KlondikePile>>(&self, src: S) -> Option<&Card> {
 		match src.into() {
-			KlondikePile::Tableau(tableau) => self.tableau_face_up_cards(tableau).last(),
+			KlondikePile::Tableau(tableau) => match tableau {
+				Tableau::Tableau1 => self.tableau1.face_up().last(),
+				Tableau::Tableau2 => self.tableau2.face_up().last(),
+				Tableau::Tableau3 => self.tableau3.face_up().last(),
+				Tableau::Tableau4 => self.tableau4.face_up().last(),
+				Tableau::Tableau5 => self.tableau5.face_up().last(),
+				Tableau::Tableau6 => self.tableau6.face_up().last(),
+				Tableau::Tableau7 => self.tableau7.face_up().last(),
+			},
 			KlondikePile::Foundation(foundation) => self.foundations[foundation as usize].last(),
 			KlondikePile::Stock => self.stock.face_up().last(),
 		}
@@ -582,7 +588,7 @@ impl Klondike {
 	/// Check if the game should be auto-completed
 	pub fn is_win_trivial(&self) -> bool {
 		// all face down cards empty means win
-		self.state.stock.is_empty()
+		self.state.stock.face_down().is_empty()
 			&& self.state.tableau1.face_down().is_empty()
 			&& self.state.tableau2.face_down().is_empty()
 			&& self.state.tableau3.face_down().is_empty()
@@ -604,7 +610,7 @@ impl Klondike {
 				KlondikePileStack::Tableau(TableauStack {
 					tableau,
 					skip_cards: SkipCards::Skip0,
-				}) if !self.state().tableau_face_down_cards(tableau).is_empty()
+				}) if !self.state().is_tableau_face_down_empty(tableau)
 					|| self
 						.state()
 						.stack_bottom_card(dst_tableau.src)