Configurable draw chance for momentum play

diff --git a/src/lib.rs b/src/lib.rs
index 19d003ad904196f10978f1e66f9bb39bbd896884..09bd5fbc2599bf7725b486a183b667bd84c3aa6c 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -405,22 +405,23 @@ impl Player {
     }
 }
 
     }
 }
 

-#[must_use]
-pub fn random_player(game: &Game) -> Play {
-    match game.phase {
-        Phase::Play => Play::Play(
-            *game
-                .current_player_hand()
-                .random()
-                .expect("I always have a card to play because I just drew one"),
-        ),
-        Phase::Momentum => {
-            if rand::thread_rng().gen_bool(0.5) {
-                Play::Draw
-            } else {
-                match game.current_player_hand().random() {
-                    Some(card) => Play::Play(*card),
-                    None => Play::Draw,
+pub fn random_player(draw_chance: f64) -> impl FnMut(&Game) -> Play {
+    move |game: &Game| -> Play {
+        match game.phase {
+            Phase::Play => Play::Play(
+                *game
+                    .current_player_hand()
+                    .random()
+                    .expect("I always have a card to play because I just drew one"),
+            ),
+            Phase::Momentum => {
+                if rand::thread_rng().gen_bool(draw_chance) {
+                    Play::Draw
+                } else {
+                    match game.current_player_hand().random() {
+                        Some(card) => Play::Play(*card),
+                        None => Play::Draw,
+                    }

                 }
             }
         }
                 }
             }
         }


@@ -500,7 +501,7 @@ mod tests {
     #[test]
     fn test_game() {
         for num_players in 1..10 {
     #[test]
     fn test_game() {
         for num_players in 1..10 {

-            let players: Vec<_> = std::iter::from_fn(|| Some(Player::new(random_player)))
+            let players: Vec<_> = std::iter::from_fn(|| Some(Player::new(random_player(0.5))))

                 .take(num_players)
                 .collect();
             let mut game = Game::default();
                 .take(num_players)
                 .collect();
             let mut game = Game::default();

diff --git a/src/main.rs b/src/main.rs
index 16bb4f790910ff5e2be89ac6a50d211a8abae850..c7c1c9268a055a1ffcd71cf0f2e93095aa49d352 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -12,6 +12,9 @@ struct Cli {
 enum Commands {
     /// Runs simulations
     Sim {
 enum Commands {
     /// Runs simulations
     Sim {

+        /// For momentum play, draw how often?  0-1
+        #[arg(short = 'p', long, default_value_t = 0.5)]
+        draw_chance: f64,

         /// How many games?
         #[arg(short = 'g', long, default_value_t = 1)]
         num_games: usize,
         /// How many games?
         #[arg(short = 'g', long, default_value_t = 1)]
         num_games: usize,


@@ -26,13 +29,15 @@ fn main() -> Result<(), &'static str> {
 
     match &cli.command {
         Some(Commands::Sim {
 
     match &cli.command {
         Some(Commands::Sim {

+            draw_chance,

             num_games,
             num_players,
         }) => {
             for _ in 0..*num_games {
             num_games,
             num_players,
         }) => {
             for _ in 0..*num_games {

-                let players: Vec<_> = std::iter::from_fn(|| Some(Player::new(random_player)))
-                    .take(*num_players)
-                    .collect();
+                let players: Vec<_> =
+                    std::iter::from_fn(|| Some(Player::new(random_player(*draw_chance))))
+                        .take(*num_players)
+                        .collect();

                 let mut game = Game::default();
                 for _ in 0..*num_players {
                     game.add_player();
                 let mut game = Game::default();
                 for _ in 0..*num_players {
                     game.add_player();