refactor: move into separate modules separating cli/lib per game

Author: tristan-f-r

Cargo.lock

@@ -13,11 +13,6 @@ edition = "2021"
 "rayon" = ["dep:rayon", "xxhash", "dep:sysinfo", "dep:moka"]
 "reinforcement" = ["dep:rand", "dep:dfdx", "dep:itertools"]
 
-[dev-dependencies]
-anyhow = "1.0.72"
-array2d = "0.3.0"
-ndarray = "0.15.6"
-
 [dependencies]
 dfdx = { git = "https://github.com/coreylowman/dfdx.git", rev = "4722a99", optional = true }
 moka = { version = "0.12", optional = true, features = ["future"] }

crates/game-solver/Cargo.toml

@@ -0,0 +1,22 @@
+[package]
+name = "games-ui"
+description = "UI counterparts for the games crate"
+license = "MPL"
+edition = "2021"
+
+[dependencies]
+eframe = { version = "0.27.2", default-features = false, features = [
+    "accesskit",
+    "default_fonts",
+    "glow",
+    "persistence"
+]}
+egui = "0.27.2"
+game-solver = { path = "../game-solver", features = ["rayon", "reinforcement"] }
+serde = { version = "1.0.203", features = ["derive"] }
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+env_logger = "0.11"
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+wasm-bindgen-futures = "0.4"

crates/games-ui/Cargo.toml

@@ -0,0 +1,4 @@
+#![warn(clippy::all, rust_2018_idioms)]
+
+mod app;
+pub use app::TemplateApp;

crates/games/Trunk.toml renamed to crates/games-ui/Trunk.toml

@@ -1,22 +1,11 @@
 [package]
 name = "games"
-description = "List of games and their UI counterparts for game-solver."
 license = "MPL"
 edition = "2021"
 
 [dependencies]
-eframe = { version = "0.27.2", default-features = false, features = [
-    "accesskit",
-    "default_fonts",
-    "glow",
-    "persistence"
-]}
-egui = "0.27.2"
 game-solver = { path = "../game-solver", features = ["rayon", "reinforcement"] }
-serde = { version = "1.0.203", features = ["derive"] }
-
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-env_logger = "0.11"
-
-[target.'cfg(target_arch = "wasm32")'.dependencies]
-wasm-bindgen-futures = "0.4"
+anyhow = "1.0.72"
+array2d = "0.3.0"
+ndarray = "0.15.6"
+itertools = "0.13.0"

crates/games/index.html renamed to crates/games-ui/index.html

@@ -0,0 +1,41 @@
+use std::{collections::HashMap, env::args};
+
+use game_solver::{game::Game, move_scores};
+
+use crate::games::chomp::Chomp;
+
+pub fn main() {
+    let mut game = Chomp::new(6, 4);
+
+    // parse every move in args, e.g. 0-0 1-1 in args
+    args().skip(1).for_each(|arg| {
+        let numbers: Vec<usize> = arg
+            .split('-')
+            .map(|num| num.parse::<usize>().expect("Not a number!"))
+            .collect();
+
+        game.make_move(&(numbers[0], numbers[1]));
+    });
+
+    print!("{}", game);
+    println!("Player {:?} to move", game.player());
+
+    let mut move_scores = move_scores(&game, &mut HashMap::new()).collect::<Vec<_>>();
+
+    if move_scores.is_empty() {
+        println!("Player {:?} won!", game.player().opponent());
+    } else {
+        move_scores.sort_by_key(|m| m.1);
+        move_scores.reverse();
+
+        let mut current_move_score = None;
+        for (game_move, score) in move_scores {
+            if current_move_score != Some(score) {
+                println!("\n\nBest moves @ score {}:", score);
+                current_move_score = Some(score);
+            }
+            print!("({}, {}), ", game_move.0, game_move.1);
+        }
+        println!();
+    }
+}

crates/games/src/app.rs renamed to crates/games-ui/src/app.rs

@@ -11,15 +11,12 @@
 //! However, it serves as a great test for the transposition table, as it is a game that commonly
 //! repeats positions (as it only has nxm - 1 positions).
 
+pub mod cli;
+
 use array2d::Array2D;
-use game_solver::{
-    game::{Game, ZeroSumPlayer},
-    move_scores,
-};
+use game_solver::game::{Game, ZeroSumPlayer};
 
 use std::{
-    collections::HashMap,
-    env::args,
     fmt::{Display, Formatter},
     hash::Hash,
 };
@@ -125,44 +122,12 @@ impl Display for Chomp {
     }
 }
 
-fn main() {
-    let mut game = Chomp::new(6, 4);
-
-    // parse every move in args, e.g. 0-0 1-1 in args
-    args().skip(1).for_each(|arg| {
-        let numbers: Vec<usize> = arg
-            .split('-')
-            .map(|num| num.parse::<usize>().expect("Not a number!"))
-            .collect();
-
-        game.make_move(&(numbers[0], numbers[1]));
-    });
-
-    print!("{}", game);
-    println!("Player {:?} to move", game.player());
-
-    let mut move_scores = move_scores(&game, &mut HashMap::new()).collect::<Vec<_>>();
-
-    if move_scores.is_empty() {
-        println!("Player {:?} won!", game.player().opponent());
-    } else {
-        move_scores.sort_by_key(|m| m.1);
-        move_scores.reverse();
-
-        let mut current_move_score = None;
-        for (game_move, score) in move_scores {
-            if current_move_score != Some(score) {
-                println!("\n\nBest moves @ score {}:", score);
-                current_move_score = Some(score);
-            }
-            print!("({}, {}), ", game_move.0, game_move.1);
-        }
-        println!();
-    }
-}
-
 #[cfg(test)]
 mod tests {
+    use std::collections::HashMap;
+
+    use game_solver::move_scores;
+
     use super::*;
 
     #[test]

crates/games-ui/src/lib.rs

@@ -0,0 +1,41 @@
+use std::{collections::HashMap, env::args};
+
+use game_solver::{game::Game, move_scores};
+
+use crate::games::domineering::DomineeringGame;
+
+pub fn main() {
+    let mut game = DomineeringGame::new();
+
+    // parse every move in args, e.g. 0-0 1-1 in args
+    args().skip(1).for_each(|arg| {
+        let numbers: Vec<usize> = arg
+            .split('-')
+            .map(|num| num.parse::<usize>().expect("Not a number!"))
+            .collect();
+
+        game.make_move(&(numbers[0], numbers[1]));
+    });
+
+    print!("{}", game);
+    println!("Player {:?} to move", game.player());
+
+    let mut move_scores = move_scores(&game, &mut HashMap::new()).collect::<Vec<_>>();
+
+    if !move_scores.is_empty() {
+        move_scores.sort_by_key(|m| m.1);
+        move_scores.reverse();
+
+        let mut current_move_score = None;
+        for (game_move, score) in move_scores {
+            if current_move_score != Some(score) {
+                println!("\n\nBest moves @ score {}:", score);
+                current_move_score = Some(score);
+            }
+            print!("({}, {}), ", game_move.0, game_move.1);
+        }
+        println!();
+    } else {
+        println!("Player {:?} won!", game.player().opponent());
+    }
+}

crates/games/src/main.rs renamed to crates/games-ui/src/main.rs

@@ -4,15 +4,12 @@
 //!
 //! Learn more: https://en.wikipedia.org/wiki/Connect_Four
 
+pub mod cli;
+
 use array2d::Array2D;
-use game_solver::{
-    game::{Game, ZeroSumPlayer},
-    move_scores,
-};
+use game_solver::game::{Game, ZeroSumPlayer};
 
 use std::{
-    collections::HashMap,
-    env::args,
     fmt::{Display, Formatter},
     hash::Hash,
 };
@@ -133,44 +130,12 @@ impl<const WIDTH: usize, const HEIGHT: usize> Display for Domineering<WIDTH, HEI
 // n, m
 type DomineeringGame = Domineering<5, 5>;
 
-fn main() {
-    let mut game = DomineeringGame::new();
-
-    // parse every move in args, e.g. 0-0 1-1 in args
-    args().skip(1).for_each(|arg| {
-        let numbers: Vec<usize> = arg
-            .split('-')
-            .map(|num| num.parse::<usize>().expect("Not a number!"))
-            .collect();
-
-        game.make_move(&(numbers[0], numbers[1]));
-    });
-
-    print!("{}", game);
-    println!("Player {:?} to move", game.player());
-
-    let mut move_scores = move_scores(&game, &mut HashMap::new()).collect::<Vec<_>>();
-
-    if !move_scores.is_empty() {
-        move_scores.sort_by_key(|m| m.1);
-        move_scores.reverse();
-
-        let mut current_move_score = None;
-        for (game_move, score) in move_scores {
-            if current_move_score != Some(score) {
-                println!("\n\nBest moves @ score {}:", score);
-                current_move_score = Some(score);
-            }
-            print!("({}, {}), ", game_move.0, game_move.1);
-        }
-        println!();
-    } else {
-        println!("Player {:?} won!", game.player().opponent());
-    }
-}
-
 #[cfg(test)]
 mod tests {
+    use std::collections::HashMap;
+
+    use game_solver::move_scores;
+
     use super::*;
 
     /// Get the winner of a generic configuration of domineering

crates/games/Cargo.toml

@@ -0,0 +1,6 @@
+pub mod chomp;
+pub mod domineering;
+pub mod nim;
+pub mod order_and_chaos;
+pub mod reversi;
+pub mod tic_tac_toe;