refactor

.gitignore

@@ -1,4 +1,5 @@
 .venv
 .sesskey
+*.so
 target/
 __pycache__/

Cargo.toml

@@ -4,10 +4,9 @@ version = "0.1.0"
 edition = "2021"
 
 [lib]
-name = "othello"
+name = "_othello"
 
 crate-type = ["cdylib", "rlib"]
-# crate-type = ["cdylib"]
 
 [dependencies]
 pyo3 = { version = "0.22.2", features = ["extension-module"] }

README.md

@@ -12,9 +12,14 @@ license: apache-2.0
 
 Othello Game implemented in Rust and python.
 
+```bash
+pip install .
+othello-ui
+```
+
 ## Dev
 
 ```bash
 uv sync
-python ui.py
+python python/othello/ui.py
 ```

pyproject.toml

@@ -17,5 +17,15 @@ managed = true
 dev-dependencies = [
     "ruff>=0.6.2",
     "pip>=24.2",
-    "maturin>=1,<2"
+    "maturin>=1,<2",
+    "tqdm>=4.66.5",
 ]
+
+[tool.maturin]
+python-source = "python"
+module-name = "othello._othello"
+bindings = 'pyo3'
+features = ["pyo3/extension-module"]
+
+[project.scripts]
+othello-ui = "othello.ui:main"

python/benchmark.py

@@ -0,0 +1,38 @@
+from othello import Game, AlphaBetaBot
+import tqdm
+
+
+def run_match(bot1, bot2):
+    game = Game.default()
+    while not game.state.ended:
+        bot = bot1 if game.state.player == "B" else bot2
+        pos = bot.find_move(game)
+        if pos >= 0:
+            game.make_move(pos)
+        else:
+            game.pass_move()
+    w, b = game.state.white_score, game.state.black_score
+    return 1 if b > w else 2 if w > b else 0
+
+
+def run_matches(bot1, bot2, n):
+    cnts = [0, 0, 0]
+    for _ in tqdm.tqdm(range(n)):
+        result = run_match(bot1, bot2)
+        cnts[result] += 1
+    return cnts
+
+
+if __name__ == "__main__":
+    for i in range(2, 10):
+        bot1 = AlphaBetaBot(i)
+        bot2 = AlphaBetaBot(i + 1)
+        print(f"AlphaBetaBot({bot1.depth}) vs AlphaBetaBot({bot2.depth})")
+        draw, win, lost = run_matches(bot1, bot2, 10)
+        print(f"Win: {win} | Draw: {draw} | Lost: {lost}")
+        print("----")
+
+        print(f"AlphaBetaBot({bot2.depth}) vs AlphaBetaBot({bot1.depth})")
+        draw, win, lost = run_matches(bot2, bot1, 10)
+        print(f"Win: {win} | Draw: {draw} | Lost: {lost}")
+        print("----")

python/othello/__init__.py

@@ -0,0 +1,3 @@
+from othello._othello import Game, AlphaBetaBot
+
+__all__ = ["Game", "AlphaBetaBot"]

ui.py → python/othello/ui.py

@@ -4,7 +4,6 @@ from fasthtml.common import (
     Div,
     serve,
     Script,
-    Span,
     cookie,
     A,
     RedirectResponse,
@@ -16,7 +15,6 @@ app, rt = fast_app(
     hdrs=[Script(src="https://cdn.tailwindcss.com")],
     pico=False,
     ws_hdr=True,
-    live=True,
 )
 
 games = {}
@@ -88,7 +86,7 @@ def make_status_bar(state):
             f"Black: {state.black_score}",
             cls="bg-black text-white w-32 h-12 text-center content-center",
         ),
-        Div(Span(status, id="status", hx_swap_oob="true"), cls="content-center"),
+        Div(status, cls="content-center"),
         Div(
             f"White: {state.white_score}",
             cls="bg-white text-black w-32 h-12 text-center content-center",
@@ -110,7 +108,7 @@ def get_status(state):
             status = "Game draw!"
     elif state.player == "W":
         status = "White turn"
-    return Span(status, id="status", hx_swap_oob="true")
+    return status
 
 
 @app.ws("/wscon")
@@ -147,4 +145,9 @@ async def ws(uuid: str, pos: int, send):
             break
 
 
-serve()
+def main():
+    serve("othello.ui", reload=False)
+
+
+if __name__ == "__main__":
+    serve()

src/ai.rs

@@ -1,21 +1,26 @@
-use crate::{bits::BitBoard, consts::ALPHA_BETA_SCORES, game::Game};
+use crate::{bits::BitBoard, game::Game};
 use pyo3::prelude::*;
 use rand::prelude::*;
 
-pub trait AI {
-    fn find_move(&self, board: &Game) -> usize;
+pub trait Bot {
+    /// Find the next move (an int between 0 and 63)
+    /// Return -1 if there is no legal move
+    fn find_move(&self, board: &Game) -> i32;
 }
 
 #[pyclass]
 pub struct AlphaBetaBot {
+    #[pyo3(get)]
     depth: usize,
 }
 
-impl AI for AlphaBetaBot {
-    fn find_move(&self, board: &Game) -> usize {
+impl Bot for AlphaBetaBot {
+    fn find_move(&self, g: &Game) -> i32 {
+        let count = (g.board.0 + g.board.1).count_ones() as usize;
         let (_, move_) = self.do_search(
+            &AlphaBetaEval { count },
             &mut rand::thread_rng(),
-            &board.board,
+            &g.board,
             self.depth,
             -i32::MAX,
             i32::MAX,
@@ -32,7 +37,7 @@ impl AlphaBetaBot {
     }
 
     #[pyo3(name = "find_move")]
-    fn run(&self, board: &Game) -> usize {
+    fn run(&self, board: &Game) -> i32 {
         self.find_move(board)
     }
 }
@@ -40,24 +45,25 @@ impl AlphaBetaBot {
 impl AlphaBetaBot {
     fn do_search(
         &self,
+        eval: &AlphaBetaEval,
         rng: &mut ThreadRng,
         board: &BitBoard,
         depth: usize,
         mut alpha: i32,
         beta: i32,
-    ) -> (i32, usize) {
+    ) -> (i32, i32) {
         if depth == 0 {
-            return (self.evaluate(board), 0);
+            return (eval.evaluate(board), -1);
         }
         let mut moves = board.available_moves_list();
         if moves.is_empty() {
             let board = board.pass_move();
             let moves = board.available_moves();
             if moves == 0 {
-                return (self.final_evaluate(&board), 0);
+                return (eval.final_evaluate(&board), -1);
             }
-            let (score, _) = self.do_search(rng, &board, depth - 1, -beta, -alpha);
-            return (-score, 0);
+            let (score, _) = self.do_search(eval, rng, &board, depth - 1, -beta, -alpha);
+            return (-score, -1);
         }
         moves.shuffle(rng);
         let mut best_move = moves[0];
@@ -66,6 +72,7 @@ impl AlphaBetaBot {
                 break;
             }
             let (score, _) = self.do_search(
+                eval,
                 rng,
                 &board.make_move(move_).unwrap(),
                 depth - 1,
@@ -77,23 +84,31 @@ impl AlphaBetaBot {
                 best_move = move_
             }
         }
-        (alpha, best_move)
+        (alpha, best_move as i32)
     }
+}
+
+struct AlphaBetaEval {
+    // Number of pieces at the beginning of search
+    count: usize,
+}
 
+impl AlphaBetaEval {
     fn evaluate(&self, board: &BitBoard) -> i32 {
-        // let (sc1, sc2) = board.count();
-        // if sc1 + sc2 > 54 {
-        //     return 5 * (sc1 - sc2);
-        // }
         let scorer = |mask: u64| {
             (0..64)
                 .filter(|i| mask >> i & 1 == 1)
-                .map(|i| ALPHA_BETA_SCORES[i])
+                .map(|i| Self::POSITION_SCORES[i])
                 .sum::<i32>()
         };
         let n_moves0 = board.available_moves().count_ones() as i32;
         let n_moves1 = board.pass_move().available_moves().count_ones() as i32;
-        scorer(board.0) - scorer(board.1) + 10 * n_moves0 - 10 * n_moves1
+        let mut score = scorer(board.0) - scorer(board.1) + 10 * n_moves0 - 10 * n_moves1;
+        if self.count > 54 {
+            let (cnt0, cnt1) = board.count();
+            score += 2 * (self.count as i32 - 54) * (cnt0 - cnt1) as i32;
+        }
+        score
     }
 
     fn final_evaluate(&self, board: &BitBoard) -> i32 {
@@ -106,39 +121,41 @@ impl AlphaBetaBot {
             0
         }
     }
+
+    #[rustfmt::skip]
+    const POSITION_SCORES: [i32; 64] = [
+        300, -40,  20,   5,   5,  20, -40, 300,
+        -40, -80,  -5,  -5,  -5,  -5, -80, -40,
+        20,  -5,  15,   1,   1,  15,  -5,  20,
+        5,  -5,   1,   1,   1,   1,  -5,   5,
+        5,  -5,   1,   1,   1,   1,  -5,   5,
+        20,  -5,  15,   1,   1,  15,  -5,  20,
+        -40, -80,  -5,  -5,  -5,  -5, -80, -40,
+        300, -40,  20,   5,   5,  20, -40, 300,
+    ];
 }
 
 #[cfg(test)]
 mod tests {
-    use crate::{bits::BitBoard, game::Game};
+    use crate::game::Game;
 
-    use super::{AlphaBetaBot, AI};
+    use super::{AlphaBetaBot, Bot};
 
     #[test]
     fn test() {
         let mut b = Game::default();
-        let ai = [AlphaBetaBot { depth: 5 }, AlphaBetaBot { depth: 6 }];
+        let ai = [AlphaBetaBot { depth: 6 }, AlphaBetaBot { depth: 3 }];
 
-        for i in 0..80 {
-            if b.available_moves().is_empty() {
+        while !b.state.ended {
+            let pos = ai[b.current_player].find_move(&b);
+            if pos < 0 {
                 b.pass_move();
                 println!("PASS");
             } else {
-                let move_ = ai[i % 2].find_move(&b);
-                let state = b.make_move(move_);
+                b.make_move(pos as usize);
                 println!("{}\n---\n", b.__repr__());
-                if state.ended {
-                    break;
-                }
             }
         }
-    }
-
-    #[test]
-    fn test_evaluate() {
-        let ai = AlphaBetaBot { depth: 3 };
-        let b = BitBoard(3, 12);
-        println!("{:?}", b);
-        assert_eq!(ai.evaluate(&BitBoard(3, 12)), 245);
+        assert!(b.state.black_score > b.state.white_score)
     }
 }

src/consts.rs

@@ -1,17 +1,5 @@
 #![allow(clippy::unreadable_literal)]
 
-#[rustfmt::skip]
-pub static ALPHA_BETA_SCORES: [i32; 64] = [
-    300, -40,  20,   5,   5,  20, -40, 300,
-    -40, -80,  -5,  -5,  -5,  -5, -80, -40,
-    20,  -5,  15,   1,   1,  15,  -5,  20,
-    5,  -5,   1,   1,   1,   1,  -5,   5,
-    5,  -5,   1,   1,   1,   1,  -5,   5,
-    20,  -5,  15,   1,   1,  15,  -5,  20,
-    -40, -80,  -5,  -5,  -5,  -5, -80, -40,
-    300, -40,  20,   5,   5,  20, -40, 300,
-];
-
 pub static MASK: [[[u64; 2]; 4]; 64] = [
     [
         [252, 126],

src/lib.rs

@@ -9,7 +9,7 @@ pub mod consts;
 pub mod game;
 
 #[pymodule]
-fn othello(m: &Bound<'_, PyModule>) -> PyResult<()> {
+fn _othello(m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add_class::<BitBoard>()?;
     m.add_class::<Game>()?;
     m.add_class::<AlphaBetaBot>()?;

uv.lock

@@ -201,6 +201,7 @@ dev = [
     { name = "maturin" },
     { name = "pip" },
     { name = "ruff" },
+    { name = "tqdm" },
 ]
 
 [package.metadata]
@@ -211,6 +212,7 @@ dev = [
     { name = "maturin", specifier = ">=1,<2" },
     { name = "pip", specifier = ">=24.2" },
     { name = "ruff", specifier = ">=0.6.2" },
+    { name = "tqdm", specifier = ">=4.66.5" },
 ]
 
 [[package]]
@@ -393,6 +395,18 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/c1/60/d976da9998e4f4a99e297cda09d61ce305919ea94cbeeb476dba4fece098/starlette-0.38.2-py3-none-any.whl", hash = "sha256:4ec6a59df6bbafdab5f567754481657f7ed90dc9d69b0c9ff017907dd54faeff", size = 72020 },
 ]
 
+[[package]]
+name = "tqdm"
+version = "4.66.5"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "colorama", marker = "platform_system == 'Windows'" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/58/83/6ba9844a41128c62e810fddddd72473201f3eacde02046066142a2d96cc5/tqdm-4.66.5.tar.gz", hash = "sha256:e1020aef2e5096702d8a025ac7d16b1577279c9d63f8375b63083e9a5f0fcbad", size = 169504 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/48/5d/acf5905c36149bbaec41ccf7f2b68814647347b72075ac0b1fe3022fdc73/tqdm-4.66.5-py3-none-any.whl", hash = "sha256:90279a3770753eafc9194a0364852159802111925aa30eb3f9d85b0e805ac7cd", size = 78351 },
+]
+
 [[package]]
 name = "uvicorn"
 version = "0.30.6"