Bumb MCTS API

src/agent/mcts2.rs

@@ -4,18 +4,27 @@ use std::sync::{Mutex, MutexGuard, OnceLock};
 use crate::core::{game::Color, game::State, r#move::Move};
 
 use mcts::game::{Game, PlayerIndex};
-use mcts::strategies::mcts::{util, TreeSearch};
+use mcts::strategies::mcts::select;
+use mcts::strategies::mcts::{util, SearchConfig, TreeSearch};
 use mcts::strategies::Search;
 
-type NegoTS = TreeSearch<Nego, util::ScalarAmaf>;
+type NegoTS = TreeSearch<Nego, util::Ucb1Tuned>;
 
 static MCTS_CELL: OnceLock<Mutex<NegoTS>> = OnceLock::new();
 
 fn get_agent() -> MutexGuard<'static, NegoTS> {
     MCTS_CELL
         .get_or_init(|| {
-            let mut mcts = NegoTS::default();
-            mcts.verbose = true;
+            let mcts = NegoTS::default()
+                .config(
+                    SearchConfig::default()
+                        .expand_threshold(2)
+                        .max_iterations(usize::MAX)
+                        .select(select::Ucb1Tuned {
+                            exploration_constant: 1.625,
+                        }),
+                )
+                .verbose(true);
             Mutex::new(mcts)
         })
         .lock()
@@ -24,10 +33,7 @@ fn get_agent() -> MutexGuard<'static, NegoTS> {
 
 pub fn step(state: &State, timeout: std::time::Duration) -> Option<Move> {
     let mut mcts = get_agent();
-    mcts.strategy.max_time = timeout;
-    mcts.strategy.max_iterations = usize::MAX;
-    mcts.strategy.select.exploration_constant = 0.1;
-    mcts.strategy.playouts_before_expanding = 2;
+    mcts.config.max_time = timeout;
     // mcts.strategy.max_iterations = 40000;
     Some(mcts.choose_action(state))
 }
@@ -38,6 +44,7 @@ impl PlayerIndex for Color {
     }
 }
 
+#[derive(Clone)]
 struct Nego;
 
 impl Game for Nego {

src/ui/app.rs

@@ -125,7 +125,7 @@ impl UIState {
     fn new() -> Self {
         Self {
             show_spinner: false,
-            agent_white: Agent::Mcts2(std::time::Duration::from_secs(10)),
+            agent_white: Agent::Mcts2(std::time::Duration::from_secs(40)),
             // agent_white: Agent::Human,
             agent_black: Agent::Mcts(std::time::Duration::from_secs(10)),
             user: None,