basically working version

engine/engine.rs

@@ -1,38 +1,72 @@
-use crate::game;
-use crate::player;
+use crate::game::{Board, Cell};
+use crate::player::{Player, PlayerConsole};
 
 pub struct Engine {
-    players: Vec<player::PlayerConsole>,
+    players: Vec<Box<dyn Player>>,
     turn: usize,
-    board: game::Board,
+    board: Board,
+    x: usize,
 }
 
 impl Engine {
     pub fn new() -> Engine {
-        let p1 = player::PlayerConsole::new("P1", game::CELL_X);
-        let p2 = player::PlayerConsole::new("P2", game::CELL_O);
+        // TODO: accept players as args
+        let p1 = PlayerConsole::new("Gopher");
+        let p2 = PlayerConsole::new("Rustacean");
 
-        let board = game::Board::new();
+        let board = Board::new();
 
         Engine {
-            players: vec![p1, p2],
+            players: vec![Box::new(p1), Box::new(p2)],
             turn: 0,
             board: board,
+            x: 0,
         }
     }
 
     pub fn run(&mut self) -> Result<(), Box<dyn std::error::Error>> {
         loop {
+            // setup new game for players
+            self.players[self.x].start_new_game(Cell::X)?;
+            self.players[(self.x + 1) % 2].start_new_game(Cell::O)?;
+
+            // reset board
+            self.board.reset();
+            self.turn = self.x;
+
+            // run game
+            self.run_single_game()?;
+
+            // switch sides
+            self.x = (self.x + 1) % 2
+        }
+    }
+
+    fn run_single_game(&mut self) -> Result<(), Box<dyn std::error::Error>> {
+        loop {
+            println!("{}", self.board);
+
+            // request move from player, fail if there is error
             let m = self.players[self.turn].request_move(&self.board)?;
 
-            let ok = self.board.put(m);
-            if !ok {
+            if !self.board.is_valid_move(&m) {
+                println!("invalid move");
                 continue;
             }
 
-            let winner = self.board.has_winner();
-            if winner != game::CELL_EMPTY {
-                println!("the winner is {}", self.players[self.turn].name());
+            // apply move
+            self.board.apply(m)?;
+
+            // check if there is a winner
+            if let Some(_winner) = self.board.has_winner() {
+                println!("{} wins!", self.players[self.turn].name());
+                println!("{}", self.board);
+                break;
+            }
+
+            if !self.board.valid_moves_available() {
+                println!("It's a draw!");
+                println!("{}", self.board);
                 break;
             }