style

Cargo.lock

@@ -22,10 +22,9 @@ checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3"
 
 [[package]]
 name = "card_game"
-version = "0.4.0"
+version = "0.2.0"
 dependencies = [
  "arrayvec",
- "serde",
 ]
 
 [[package]]
@@ -127,11 +126,10 @@ checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
 
 [[package]]
 name = "klondike"
-version = "0.3.0"
+version = "0.1.0"
 dependencies = [
  "card_game",
  "rand",
- "serde",
 ]
 
 [[package]]
@@ -240,7 +238,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
 dependencies = [
  "serde_core",
- "serde_derive",
 ]
 
 [[package]]

Cargo.toml

@@ -8,8 +8,8 @@ members = [
 resolver = "3"
 
 [workspace.dependencies]
-card_game = { version = "0.4.0", path = "card_game", registry = "Quaternions" }
-klondike = { version = "0.3.0", path = "klondike", registry = "Quaternions" }
+card_game = { version = "0.2.0", path = "card_game", registry = "Quaternions" }
+klondike = { version = "0.1.0", path = "klondike", registry = "Quaternions" }
 
 [workspace.lints.rust]
 # unsafe_code = "forbid"

README.md

@@ -1 +0,0 @@
-card_game/README.md

card_game/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "card_game"
-version = "0.4.0"
+version = "0.2.0"
 edition = "2024"
 repository = "https://git.aleshym.co/Quaternions/card_game"
 license = "MIT OR Apache-2.0"
@@ -8,12 +8,8 @@ description = "Card game library."
 authors = ["Rhys Lloyd <krakow20@gmail.com>"]
 keywords = ["card", "cards", "solitaire", "klondike"]
 
-[features]
-serde = ["dep:serde"]
-
 [dependencies]
 arrayvec = { version = "0.7.6", registry = "Quaternions", features = ["len_u8"], default-features = false }
-serde = { version = "1", optional = true, default-features = false, features = ["derive"] }
 
 [lints]
 workspace = true

card_game/src/lib.rs

@@ -6,11 +6,11 @@ struct ReadmeDoctests;
 use core::ops::RangeBounds;
 
 // TODO: pub struct ValidInstruction<I>(I);
-pub trait Game: Clone {
-	type Score: Clone + core::fmt::Debug;
-	type Stats: Clone + core::fmt::Debug;
-	type Config: Clone + core::fmt::Debug;
-	type Instruction: Clone + core::fmt::Debug;
+pub trait Game {
+	type Score;
+	type Stats;
+	type Config;
+	type Instruction;
 	fn score(&self, stats: &Self::Stats, config: &Self::Config) -> Self::Score;
 	fn possible_instructions(
 		&self,
@@ -28,7 +28,6 @@ pub trait Game: Clone {
 
 /// card_game supports up to 4 identifiably separate decks.
 #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub enum Deck {
 	Deck1 = 0b00,
 	Deck2 = 0b01,
@@ -49,7 +48,6 @@ impl Deck {
 }
 
 #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub enum Suit {
 	Spades = 0b00,
 	Hearts = 0b01,
@@ -79,7 +77,6 @@ impl Suit {
 }
 
 #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub enum Rank {
 	Ace = 1,
 	Two = 2,
@@ -149,8 +146,6 @@ impl Rank {
 /// 2 bits for suit ID
 /// 4 bits for card Value
 #[derive(Clone, Debug, Eq, Hash, PartialEq)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[cfg_attr(feature = "serde", serde(transparent))]
 pub struct Card(core::num::NonZeroU8);
 impl Card {
 	pub const fn new(deck: Deck, suit: Suit, rank: Rank) -> Self {
@@ -317,59 +312,6 @@ impl<const CAP: usize> Pile<CAP, CAP> {
 	}
 }
 
-#[derive(Clone, Debug)]
-pub enum SolveError {
-	MovesBudgetExceeded,
-	StatesBudgetExceeded,
-}
-impl core::fmt::Display for SolveError {
-	fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-		write!(f, "{self:?}")
-	}
-}
-impl core::error::Error for SolveError {}
-
-/// The solution tends to be very large with long chains of moves that go back to the same state.
-/// It is recommended to call .clean_solution() if the solution is actually going to be shown to a user.
-pub struct Solution<G: Game> {
-	solution: Vec<StateSnapshot<G>>,
-}
-impl<G: Game + Eq + core::hash::Hash> Solution<G> {
-	pub const fn raw_solution(&self) -> &[StateSnapshot<G>] {
-		self.solution.as_slice()
-	}
-	/// Repeatedly remove the largest range of moves that goes back into the same state.
-	/// This is a very expensive operation when the solution is very long!
-	pub fn clean_solution(self) -> Vec<StateSnapshot<G>> {
-		let mut history = self.solution;
-		// history includes cycles
-		let mut state_index: std::collections::HashMap<_, _> = history
-			.iter()
-			.enumerate()
-			.map(|(i, snapshot)| (snapshot.state().clone(), i))
-			.collect();
-
-		// find the longest range where the start and end are the same state
-		while let Some(longest_range) = history
-			.iter()
-			.enumerate()
-			.filter_map(|(index, snapshot)| {
-				let &last_index = state_index.get(snapshot.state())?;
-				let longness = last_index - index;
-				(longness != 0).then_some(index..last_index)
-			})
-			.max_by_key(|range| range.len())
-		{
-			history.drain(longest_range);
-			for (i, snapshot) in history.iter().enumerate() {
-				state_index.insert(snapshot.state().clone(), i);
-			}
-		}
-
-		history
-	}
-}
-
 #[derive(Clone, Debug)]
 pub enum SessionInstruction<I> {
 	Undo,
@@ -396,16 +338,12 @@ impl<S> SessionStats<S> {
 pub struct SessionConfig<C> {
 	pub inner: C,
 	pub undo_penalty: i32,
-	pub solve_moves_budget: u64,
-	pub solve_states_budget: u64,
 }
 impl<C> SessionConfig<C> {
 	fn new_default(inner: C) -> Self {
 		Self {
 			inner,
 			undo_penalty: -15,
-			solve_moves_budget: 100_000,
-			solve_states_budget: 100_000,
 		}
 	}
 }
@@ -415,33 +353,21 @@ impl<C: Default> Default for SessionConfig<C> {
 	}
 }
 
-#[derive(Clone, Debug)]
 pub struct Session<G: Game> {
 	stats: SessionStats<G::Stats>,
 	config: SessionConfig<G::Config>,
 	state: SessionState<G>,
 }
-#[derive(Clone, Debug)]
-pub struct StateSnapshot<G: Game> {
-	state: G,
-	instruction: G::Instruction,
-}
-impl<G: Game> StateSnapshot<G> {
-	pub const fn state(&self) -> &G {
-		&self.state
-	}
-	pub const fn instruction(&self) -> &G::Instruction {
-		&self.instruction
-	}
-}
-#[derive(Clone, Debug)]
+#[derive(Clone, Eq, Hash, PartialEq)]
 pub struct SessionState<G: Game> {
+	seed: G,
 	state: G,
-	history: Vec<StateSnapshot<G>>,
+	history: Vec<G::Instruction>,
 }
 impl<G: Game + Clone> SessionState<G> {
 	fn new(state: G) -> Self {
 		Self {
+			seed: state.clone(),
 			state,
 			history: Vec::new(),
 		}
@@ -454,9 +380,9 @@ impl<G: Game> SessionState<G> {
 }
 impl<G: Game<Score = i32>> Session<G>
 where
-	G: Eq + core::hash::Hash,
-	G::Stats: Default,
-	G::Instruction: Eq + core::hash::Hash,
+	G: Clone + Eq + core::hash::Hash,
+	G::Stats: Clone + Default,
+	G::Instruction: Clone + Eq + core::hash::Hash,
 {
 	pub fn new(state: G, config: SessionConfig<G::Config>) -> Self {
 		Self {
@@ -480,7 +406,7 @@ where
 	pub const fn config(&self) -> &SessionConfig<G::Config> {
 		&self.config
 	}
-	pub fn history(&self) -> &[StateSnapshot<G>] {
+	pub fn history(&self) -> &[G::Instruction] {
 		&self.state.history
 	}
 	pub fn undo(&mut self) {
@@ -500,52 +426,14 @@ where
 	pub fn is_win(&self) -> bool {
 		self.state.is_win()
 	}
-	/// Attempt to produce a solution.
-	pub fn solve(&self) -> Result<Option<Solution<G>>, SolveError> {
-		let mut state_moves = std::collections::HashMap::new();
-		let mut session = self.clone();
-		let mut moves = 0;
-		while !session.is_win() {
-			moves += 1;
-			if self.config.solve_moves_budget < moves {
-				return Err(SolveError::MovesBudgetExceeded);
-			}
-			if self.config.solve_states_budget < state_moves.len() as u64 {
-				return Err(SolveError::StatesBudgetExceeded);
-			}
-			// Continue existing iterator if it exists
-			let it = state_moves
-				.entry(session.state().state().clone())
-				.or_insert_with(|| {
-					session
-						.state()
-						.state()
-						.possible_instructions(&self.config().inner)
-				});
-
-			// Run one possible move
-			if let Some(instruction) = it.next() {
-				session.process_instruction(instruction);
-				continue;
-			}
-
-			// No more moves. If we can't undo we're done
-			if session.history().is_empty() {
-				return Ok(None);
-			} else {
-				session.undo();
-			}
-		}
-		Ok(Some(Solution {
-			solution: session.state.history,
-		}))
-	}
 }
 impl<G: Game<Score = i32>> Game for SessionState<G>
 where
+	G: Clone,
 	G::Stats: Default,
+	G::Instruction: Clone,
 {
-	type Score = G::Score;
+	type Score = i32;
 	type Stats = SessionStats<G::Stats>;
 	type Config = SessionConfig<G::Config>;
 	type Instruction = SessionInstruction<G::Instruction>;
@@ -576,16 +464,19 @@ where
 	) {
 		match instruction {
 			SessionInstruction::Undo => {
-				if let Some(snapshot) = self.history.pop() {
-					self.state = snapshot.state;
+				// replay the entire history of the game except one move
+				self.history.pop();
+				let mut inner_stats = G::Stats::default();
+				let mut state = self.seed.clone();
+				for instruction in &self.history {
+					state.process_instruction(&mut inner_stats, &config.inner, instruction.clone());
+				}
+				self.state = state;
+				stats.inner = inner_stats;
 				stats.increment_undos();
 			}
-			}
 			SessionInstruction::InnerInstruction(instruction) => {
-				self.history.push(StateSnapshot {
-					state: self.state.clone(),
-					instruction: instruction.clone(),
-				});
+				self.history.push(instruction.clone());
 				self.state
 					.process_instruction(&mut stats.inner, &config.inner, instruction);
 			}

klondike-cli/src/main.rs

@@ -4,8 +4,8 @@ use klondike::{
 	KlondikePile, KlondikePileStack, SkipCards, Tableau, TableauStack,
 };
 
-#[cfg(test)]
-mod test;
+// #[cfg(test)]
+// mod test;
 
 use std::fmt::Display;
 struct Displayed<T>(T);
@@ -117,7 +117,7 @@ impl Display for DisplayStats<'_> {
 			self.0.stats().stats().recycle_count(),
 			self.0.stats().stats().moves(),
 			self.0.stats().undos(),
-			self.0.state().score(self.0.stats(), self.0.config()),
+			self.0.state().score(self.0.stats(), &self.0.config()),
 		)
 	}
 }
@@ -239,7 +239,7 @@ fn main() -> Result<(), std::io::Error> {
 	use rand::RngExt;
 	let mut rng = rand::rng();
 	// seed from cli argument
-	let mut seed = if let Some(seed) = std::env::args().nth(1) {
+	let mut seed = if let Some(seed) = std::env::args().skip(1).next() {
 		seed.parse().expect("Invalid u64 seed")
 	} else {
 		rng.random()

klondike-cli/src/test.rs

@@ -1,16 +1,33 @@
-use card_game::Session;
 use klondike::Klondike;
+use card_game::Session;
 #[test]
 fn test_is_winnable() {
 	// is winnable
-	let solution_result = Session::new_default(Klondike::with_seed(124)).solve();
-	if let Ok(Some(solution)) = solution_result {
-		let win_moves = solution.clean_solution();
-		// for (i, ins) in win_moves.into_iter().enumerate() {
-		// 	println!("{i} = {:?}", ins.instruction());
-		// }
-		println!("Game is winnable with {} moves", win_moves.len());
-	} else {
-		println!("Game is not winnable");
-	}
+	let is_winnable = Session::new_default(Klondike::with_seed(123)).is_winnable();
+	println!("is_winnable = {is_winnable:?}");
+}
+#[test]
+fn test_klondike() {
+	// create game session
+	let game = Klondike::with_seed(123);
+	let mut session = Session::new_default(game);
+
+	// is winnable
+	let is_winnable = session.is_winnable();
+	println!("is_winnable = {is_winnable:?}");
+
+	// play game
+	while let Some(instruction) = session.possible_instructions().next() {
+		session.process_instruction(instruction);
+	}
+
+	// did win
+	let is_win = session.is_win();
+
+	// print session history
+	for (i, instruction) in session.history().iter().enumerate() {
+		println!("move {i} = {instruction:?}");
+	}
+
+	println!("is_win = {is_win}");
 }

klondike/Cargo.toml

@@ -1,15 +1,11 @@
 [package]
 name = "klondike"
-version = "0.3.0"
+version = "0.1.0"
 edition = "2024"
 
-[features]
-serde = ["dep:serde"]
-
 [dependencies]
 card_game.workspace = true
 rand = { version = "0.10.1", default-features = false, features = ["std_rng"] }
-serde = { version = "1", optional = true, default-features = false, features = ["derive"] }
 
 [lints]
 workspace = true

klondike/README.md

@@ -15,7 +15,7 @@ let config = KlondikeConfig::default();
 let mut session = Session::new_default(game);
 
 // play game a bit
-while let Some(instruction) = session.state().state().get_auto_move(&config) {
+while let Some(instruction) = session.state().get_auto_move(&config) {
 	session.process_instruction(instruction);
 
 	// quit after 200 moves or win

klondike/src/lib.rs

@@ -78,24 +78,12 @@ impl KlondikeStats {
 			+ self.move_from_foundation_count as i32 * config.move_from_foundation
 			+ self.recycle_count as i32 * config.recycle
 	}
-	pub const fn moves(&self) -> u32 {
-		self.moves
-	}
-	pub const fn move_to_foundation_count(&self) -> u32 {
-		self.move_to_foundation_count
-	}
-	pub const fn flip_up_bonus_count(&self) -> u32 {
-		self.flip_up_bonus_count
-	}
-	pub const fn move_to_tableau_count(&self) -> u32 {
-		self.move_to_tableau_count
-	}
-	pub const fn move_from_foundation_count(&self) -> u32 {
-		self.move_from_foundation_count
-	}
 	pub const fn recycle_count(&self) -> u32 {
 		self.recycle_count
 	}
+	pub const fn moves(&self) -> u32 {
+		self.moves
+	}
 	/// A card was moved to a foundation.
 	const fn increment_move_to_foundation(&mut self) {
 		self.move_to_foundation_count += 1;
@@ -121,7 +109,6 @@ impl KlondikeStats {
 }
 
 #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub enum Tableau {
 	Tableau1,
 	Tableau2,
@@ -148,7 +135,6 @@ impl Tableau {
 }
 
 #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub enum Foundation {
 	Foundation1,
 	Foundation2,
@@ -169,7 +155,6 @@ impl Foundation {
 }
 
 #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub enum KlondikePile {
 	Tableau(Tableau),
 	Stock,
@@ -203,7 +188,6 @@ impl From<Foundation> for KlondikePile {
 }
 
 #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub enum SkipCards {
 	Skip0,
 	Skip1,
@@ -242,7 +226,6 @@ impl SkipCards {
 }
 
 #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct TableauStack {
 	pub tableau: Tableau,
 	pub skip_cards: SkipCards,
@@ -276,7 +259,6 @@ impl TableauStack {
 }
 
 #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub enum KlondikePileStack {
 	Tableau(TableauStack),
 	Stock,
@@ -300,7 +282,6 @@ impl KlondikePileStack {
 }
 
 #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct DstFoundation {
 	pub src: KlondikePile,
 	pub foundation: Foundation,
@@ -324,7 +305,6 @@ impl DstFoundation {
 }
 
 #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct DstTableau {
 	pub src: KlondikePileStack,
 	pub tableau: Tableau,
@@ -348,7 +328,6 @@ impl DstTableau {
 }
 
 #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub enum KlondikeInstruction {
 	DstFoundation(DstFoundation),
 	DstTableau(DstTableau),
@@ -386,55 +365,54 @@ const fn sum(n: usize) -> usize {
 	n * (n + 1) / 2
 }
 const STOCK: usize = 52 - sum(TABLEAUS);
-const NUM_RANKS: usize = Rank::RANKS.len();
 
 #[derive(Clone, Debug, Eq, Hash, PartialEq)]
 pub struct KlondikeState {
 	stock: Pile<STOCK, STOCK>,
-	foundations: [Stack<NUM_RANKS>; 4],
-	tableau1: Pile<0, NUM_RANKS>,
-	tableau2: Pile<1, NUM_RANKS>,
-	tableau3: Pile<2, NUM_RANKS>,
-	tableau4: Pile<3, NUM_RANKS>,
-	tableau5: Pile<4, NUM_RANKS>,
-	tableau6: Pile<5, NUM_RANKS>,
-	tableau7: Pile<6, NUM_RANKS>,
+	foundations: [Stack<13>; 4],
+	tableau1: Pile<0, 13>,
+	tableau2: Pile<1, 13>,
+	tableau3: Pile<2, 13>,
+	tableau4: Pile<3, 13>,
+	tableau5: Pile<4, 13>,
+	tableau6: Pile<5, 13>,
+	tableau7: Pile<6, 13>,
 }
 impl KlondikeState {
 	pub const fn stock(&self) -> &Pile<STOCK, STOCK> {
 		&self.stock
 	}
-	pub const fn foundation1(&self) -> &Stack<NUM_RANKS> {
+	pub const fn foundation1(&self) -> &Stack<13> {
 		&self.foundations[Foundation::Foundation1 as usize]
 	}
-	pub const fn foundation2(&self) -> &Stack<NUM_RANKS> {
+	pub const fn foundation2(&self) -> &Stack<13> {
 		&self.foundations[Foundation::Foundation2 as usize]
 	}
-	pub const fn foundation3(&self) -> &Stack<NUM_RANKS> {
+	pub const fn foundation3(&self) -> &Stack<13> {
 		&self.foundations[Foundation::Foundation3 as usize]
 	}
-	pub const fn foundation4(&self) -> &Stack<NUM_RANKS> {
+	pub const fn foundation4(&self) -> &Stack<13> {
 		&self.foundations[Foundation::Foundation4 as usize]
 	}
-	pub const fn tableau1(&self) -> &Pile<0, NUM_RANKS> {
+	pub const fn tableau1(&self) -> &Pile<0, 13> {
 		&self.tableau1
 	}
-	pub const fn tableau2(&self) -> &Pile<1, NUM_RANKS> {
+	pub const fn tableau2(&self) -> &Pile<1, 13> {
 		&self.tableau2
 	}
-	pub const fn tableau3(&self) -> &Pile<2, NUM_RANKS> {
+	pub const fn tableau3(&self) -> &Pile<2, 13> {
 		&self.tableau3
 	}
-	pub const fn tableau4(&self) -> &Pile<3, NUM_RANKS> {
+	pub const fn tableau4(&self) -> &Pile<3, 13> {
 		&self.tableau4
 	}
-	pub const fn tableau5(&self) -> &Pile<4, NUM_RANKS> {
+	pub const fn tableau5(&self) -> &Pile<4, 13> {
 		&self.tableau5
 	}
-	pub const fn tableau6(&self) -> &Pile<5, NUM_RANKS> {
+	pub const fn tableau6(&self) -> &Pile<5, 13> {
 		&self.tableau6
 	}
-	pub const fn tableau7(&self) -> &Pile<6, NUM_RANKS> {
+	pub const fn tableau7(&self) -> &Pile<6, 13> {
 		&self.tableau7
 	}
 	pub fn tableau_face_down_cards(&self, tableau: Tableau) -> &[Card] {
@@ -471,20 +449,14 @@ impl KlondikeState {
 			KlondikePileStack::Stock => self.stock.face_up().last(),
 		}
 	}
-	pub fn tableau_top_card(&self, tableau: Tableau) -> Option<&Card> {
-		self.tableau_face_up_cards(tableau).last()
-	}
-	pub fn foundation_top_card(&self, foundation: Foundation) -> Option<&Card> {
-		self.foundations[foundation as usize].last()
-	}
-	pub fn top_card(&self, pile: KlondikePile) -> Option<&Card> {
-		match pile {
-			KlondikePile::Tableau(tableau) => self.tableau_top_card(tableau),
-			KlondikePile::Foundation(foundation) => self.foundation_top_card(foundation),
+	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::Foundation(foundation) => self.foundations[foundation as usize].last(),
 			KlondikePile::Stock => self.stock.face_up().last(),
 		}
 	}
-	fn take_stack_flip_up(&mut self, src: KlondikePileStack) -> (Stack<NUM_RANKS>, bool) {
+	fn take_stack(&mut self, src: KlondikePileStack) -> (Stack<13>, bool) {
 		match src {
 			KlondikePileStack::Tableau(TableauStack {
 				tableau,
@@ -505,8 +477,8 @@ impl KlondikeState {
 			KlondikePileStack::Stock => (Stack::from_iter(self.stock.pop()), false),
 		}
 	}
-	fn take_top_card_flip_up(&mut self, pile: KlondikePile) -> (Option<Card>, bool) {
-		match pile {
+	fn take_top_card<S: Into<KlondikePile>>(&mut self, src: S) -> (Option<Card>, bool) {
+		match src.into() {
 			KlondikePile::Tableau(tableau) => match tableau {
 				Tableau::Tableau1 => self.tableau1.pop_flip_up(),
 				Tableau::Tableau2 => self.tableau2.pop_flip_up(),
@@ -556,7 +528,7 @@ impl KlondikeState {
 			KlondikeInstruction::DstFoundation(dst_foundation) => {
 				// get the top cards
 				if let Some(src_card) = self.top_card(dst_foundation.src) {
-					match self.foundation_top_card(dst_foundation.foundation) {
+					match self.top_card(dst_foundation.foundation) {
 						// destination card exists
 						Some(dst_card) => {
 							// suit matches?
@@ -580,7 +552,7 @@ impl KlondikeState {
 				}
 				// get the cards
 				if let Some(src_card) = self.stack_bottom_card(dst_tableau.src) {
-					match self.tableau_top_card(dst_tableau.tableau) {
+					match self.top_card(dst_tableau.tableau) {
 						// destination card exists
 						Some(dst_card) => {
 							// red-ness is opposite?
@@ -617,10 +589,6 @@ impl Iterator for KlondikeIter {
 		instruction
 	}
 }
-#[test]
-fn test_klondike_iter() {
-	assert_eq!(KlondikeIter::new().count(), 721);
-}
 
 #[derive(Clone, Debug, Eq, Hash, PartialEq)]
 pub struct Klondike {
@@ -640,9 +608,7 @@ impl Klondike {
 		let mut deck = deck.into_iter();
 
 		// generate tableaus
-		fn pile<const DN: usize>(
-			deck: &mut <Stack<52> as IntoIterator>::IntoIter,
-		) -> Pile<DN, NUM_RANKS> {
+		fn pile<const DN: usize>(deck: &mut <Stack<52> as IntoIterator>::IntoIter) -> Pile<DN, 13> {
 			let stack = Stack::from_iter(deck.take(DN));
 			let mut pile = Pile::new_face_down(stack);
 			pile.push(deck.next().unwrap());
@@ -774,7 +740,7 @@ impl Game for Klondike {
 			// Move a card from anywhere to a foundation
 			KlondikeInstruction::DstFoundation(DstFoundation { src, foundation }) => {
 				stats.increment_move_to_foundation();
-				let (card, did_flip_up) = self.state.take_top_card_flip_up(src);
+				let (card, did_flip_up) = self.state.take_top_card(src);
 				if did_flip_up {
 					stats.increment_flip_up_bonus();
 				}
@@ -785,9 +751,9 @@ impl Game for Klondike {
 				match src {
 					KlondikePileStack::Stock => stats.increment_move_to_tableau(),
 					KlondikePileStack::Foundation(_) => stats.increment_move_from_foundation(),
-					KlondikePileStack::Tableau(_) => {}
+					_ => {}
 				}
-				let (cards, did_flip_up) = self.state.take_stack_flip_up(src);
+				let (cards, did_flip_up) = self.state.take_stack(src);
 				if did_flip_up {
 					stats.increment_flip_up_bonus();
 				}