Refactor momentum_player() for clarity

[pluta-lesnura] / src / main.rs

diff --git a/src/main.rs b/src/main.rs
index 172d58e742ae7c2c5b7fa06bab428ba71b50939c..31d95878815930d663acefc8ddbd74ff73144677 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,5 +1,5 @@
-use clap::{Parser, Subcommand};
-use pluta_lesnura::{play, random_player, Game, Player};
+use clap::{Parser, Subcommand, ValueEnum};
+use pluta_lesnura::{momentum_player, play, random_player, Game};
 
 #[derive(Parser)]
 #[command(author, version, about, long_about = None, arg_required_else_help = true)]
@@ -8,13 +8,28 @@ struct Cli {
     command: Option<Commands>,
 }
 
+#[derive(Clone, Debug, ValueEnum)]
+enum Strategy {
+    Random,
+    Momentum,
+}
+
 #[derive(Subcommand)]
 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 players?
-        #[arg(short, long)]
+        #[arg(short = 'p', long)]
         num_players: usize,
+        /// What strategy should players use?
+        #[arg(short = 's', long, value_enum)]
+        strategy: Strategy,
     },
 }
 
@@ -22,16 +37,27 @@ fn main() -> Result<(), &'static str> {
     let cli = Cli::parse();
 
     match &cli.command {
-        Some(Commands::Sim { num_players }) => {
-            let players: Vec<_> = std::iter::from_fn(|| Some(Player::new(random_player)))
-                .take(*num_players)
-                .collect();
-            let mut game = Game::default();
-            for _ in 0..*num_players {
-                game.add_player();
+        Some(Commands::Sim {
+            draw_chance,
+            num_games,
+            num_players,
+            strategy,
+        }) => {
+            let player = || match strategy {
+                Strategy::Random => random_player(*draw_chance),
+                Strategy::Momentum => momentum_player(random_player(*draw_chance)),
+            };
+            for _ in 0..*num_games {
+                let players: Vec<_> = std::iter::from_fn(|| Some(player()))
+                    .take(*num_players)
+                    .collect();
+                let mut game = Game::default();
+                for _ in 0..*num_players {
+                    game.add_player();
+                }
+                let result = play(game, players)?;
+                println!("Result: {result:?}");
             }
-            let result = play(game, players)?;
-            println!("Result: {result:?}");
             Ok(())
         }
         None => unreachable!(),