Quaternions/card_game
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

rename

Browse Source
This commit is contained in:
Rhys Lloyd
2026-05-15 08:27:55 -07:00
parent 2e1bab8c52
commit a84903af8e
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/card_game.rs
+3 -3
View File
@@ -4,7 +4,7 @@ use crate::Rng;
pub trait Game { pub trait Game {
type Instruction; type Instruction;
fn possible_instructions(&self) -> impl Iterator<Item = Self::Instruction> + use<Self>; fn possible_instructions(&self) -> impl Iterator<Item = Self::Instruction> + use<Self>;
fn validate_instruction(&self, instruction: Self::Instruction) -> bool; fn is_instruction_valid(&self, instruction: Self::Instruction) -> bool;
fn process_instruction(&mut self, instruction: Self::Instruction); fn process_instruction(&mut self, instruction: Self::Instruction);
fn is_win(&self) -> bool; fn is_win(&self) -> bool;
} }
@@ -192,8 +192,8 @@ where
fn possible_instructions(&self) -> impl Iterator<Item = Self::Instruction> + use<G> { fn possible_instructions(&self) -> impl Iterator<Item = Self::Instruction> + use<G> {
self.state.possible_instructions() self.state.possible_instructions()
} }
fn validate_instruction(&self, instruction: Self::Instruction) -> bool { fn is_instruction_valid(&self, instruction: Self::Instruction) -> bool {
self.state.validate_instruction(instruction) self.state.is_instruction_valid(instruction)
} }
fn process_instruction(&mut self, instruction: Self::Instruction) { fn process_instruction(&mut self, instruction: Self::Instruction) {
self.history.push(instruction.clone()); self.history.push(instruction.clone());
src/klondike.rs
+4 -4
View File
@@ -75,7 +75,7 @@ impl KlondikeState {
fn pile_mut(&mut self, index: KlondikePileId) -> &mut Pile { fn pile_mut(&mut self, index: KlondikePileId) -> &mut Pile {
&mut self.piles[index as usize] &mut self.piles[index as usize]
} }
fn validate_instruction(&self, instruction: KlondikeInstruction) -> bool { fn is_instruction_valid(&self, instruction: KlondikeInstruction) -> bool {
match instruction { match instruction {
// Stock -> Stock draws a card or resets the stock // Stock -> Stock draws a card or resets the stock
KlondikeInstruction { KlondikeInstruction {
@@ -208,10 +208,10 @@ impl Game for Klondike {
type Instruction = KlondikeInstruction; type Instruction = KlondikeInstruction;
fn possible_instructions(&self) -> impl Iterator<Item = Self::Instruction> + use<> { fn possible_instructions(&self) -> impl Iterator<Item = Self::Instruction> + use<> {
let state = self.state.clone(); let state = self.state.clone();
KlondikeIter::new().filter(move |&instruction| state.validate_instruction(instruction)) KlondikeIter::new().filter(move |&instruction| state.is_instruction_valid(instruction))
} }
fn validate_instruction(&self, instruction: Self::Instruction) -> bool { fn is_instruction_valid(&self, instruction: Self::Instruction) -> bool {
self.state.validate_instruction(instruction) self.state.is_instruction_valid(instruction)
} }
fn process_instruction(&mut self, instruction: Self::Instruction) { fn process_instruction(&mut self, instruction: Self::Instruction) {
let card = self.pile_mut(instruction.src).pop().unwrap(); let card = self.pile_mut(instruction.src).pop().unwrap();