diff --git a/benches/future_children.rs b/benches/future_children.rs index 51fc3ea..ee0bf8c 100644 --- a/benches/future_children.rs +++ b/benches/future_children.rs @@ -1,5 +1,8 @@ use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion}; -use othello::{board::Board, future_moves::FutureMoves, piece::Piece}; +use othello::{ + logic::FutureMoves, + repr::{Board, Piece}, +}; use std::time::Duration; fn extend_layers_test(depth: usize, expire: usize) { diff --git a/src/agent.rs b/src/agent.rs index 3a12ae3..29a8f82 100644 --- a/src/agent.rs +++ b/src/agent.rs @@ -1,4 +1,4 @@ -use crate::{board::Board, piece::Piece}; +use crate::repr::{Board, Piece}; use rand::prelude::*; use std::io; use std::io::prelude::*; diff --git a/src/complexagent.rs b/src/complexagent.rs index 19a31a6..ac54f8b 100644 --- a/src/complexagent.rs +++ b/src/complexagent.rs @@ -1,4 +1,8 @@ -use crate::{agent::Agent, board::Board, logic::future_moves::FutureMoves, piece::Piece}; +use crate::{ + agent::Agent, + logic::FutureMoves, + repr::{Board, Piece}, +}; pub struct ComplexAgent { color: Piece, diff --git a/src/game.rs b/src/game.rs index 15e6f49..89af93e 100644 --- a/src/game.rs +++ b/src/game.rs @@ -1,7 +1,6 @@ use crate::{ agent::Agent, - board::{Board, Winner}, - piece::Piece, + repr::{Board, Piece, Winner}, }; pub struct Game { diff --git a/src/lib.rs b/src/lib.rs index a964252..4dffdd7 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,8 +1,5 @@ mod agent; -mod bitboard; -pub mod board; mod complexagent; mod game; pub mod logic; -mod misc; -pub mod piece; +pub mod repr; diff --git a/src/logic/future_moves.rs b/src/logic/future_moves.rs index e06519f..15505ad 100644 --- a/src/logic/future_moves.rs +++ b/src/logic/future_moves.rs @@ -1,9 +1,8 @@ use indicatif::{ProgressIterator, ProgressStyle}; use crate::{ - board::{Board, Winner}, logic::r#move::Move, - piece::Piece, + repr::{Board, Piece, Winner}, }; pub struct FutureMoves { diff --git a/src/logic/mod.rs b/src/logic/mod.rs index 52ba3c7..7075cba 100644 --- a/src/logic/mod.rs +++ b/src/logic/mod.rs @@ -1,2 +1,3 @@ -pub mod future_moves; +mod future_moves; mod r#move; +pub use future_moves::FutureMoves; diff --git a/src/logic/move.rs b/src/logic/move.rs index 0582e36..2ae9e26 100644 --- a/src/logic/move.rs +++ b/src/logic/move.rs @@ -1,7 +1,4 @@ -use crate::{ - board::{Board, Winner}, - piece::Piece, -}; +use crate::repr::{Board, Piece, Winner}; #[derive(Clone, Debug)] pub struct Move { diff --git a/src/main.rs b/src/main.rs index ad8470c..82924e5 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,14 +1,11 @@ use game::Game; -use piece::Piece; +use repr::Piece; mod agent; -mod bitboard; -mod board; mod complexagent; mod game; mod logic; -mod misc; -mod piece; +pub mod repr; fn main() { let player1 = complexagent::ComplexAgent::new(Piece::Black); diff --git a/src/bitboard.rs b/src/repr/bitboard.rs similarity index 98% rename from src/bitboard.rs rename to src/repr/bitboard.rs index 562c896..c05306f 100644 --- a/src/bitboard.rs +++ b/src/repr/bitboard.rs @@ -1,4 +1,4 @@ -use crate::board::{BOARD_AREA, BOARD_SIZE}; +use crate::repr::board::{BOARD_AREA, BOARD_SIZE}; use const_fn::const_fn; use static_assertions::const_assert; diff --git a/src/board.rs b/src/repr/board.rs similarity index 99% rename from src/board.rs rename to src/repr/board.rs index 1dccd6b..32978db 100644 --- a/src/board.rs +++ b/src/repr/board.rs @@ -1,4 +1,4 @@ -use crate::{ +use crate::repr::{ bitboard::BitBoard, misc::{diag_raw, split_from}, piece::Piece, diff --git a/src/misc.rs b/src/repr/misc.rs similarity index 100% rename from src/misc.rs rename to src/repr/misc.rs diff --git a/src/repr/mod.rs b/src/repr/mod.rs new file mode 100644 index 0000000..81299d5 --- /dev/null +++ b/src/repr/mod.rs @@ -0,0 +1,7 @@ +mod bitboard; +mod board; +mod misc; +mod piece; + +pub use board::{Board, Winner}; +pub use piece::Piece; diff --git a/src/piece.rs b/src/repr/piece.rs similarity index 100% rename from src/piece.rs rename to src/repr/piece.rs