From 73faf4c1fbe6bc8aac1df6b2e649df331acec7bb Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 20 Feb 2025 16:00:01 -0500 Subject: [PATCH] split off logic --- src/complexagent.rs | 2 +- src/lib.rs | 3 +-- src/{ => logic}/future_moves.rs | 4 ++-- src/logic/mod.rs | 2 ++ src/{ => logic}/move.rs | 0 src/main.rs | 3 +-- 6 files changed, 7 insertions(+), 7 deletions(-) rename src/{ => logic}/future_moves.rs (99%) create mode 100644 src/logic/mod.rs rename src/{ => logic}/move.rs (100%) diff --git a/src/complexagent.rs b/src/complexagent.rs index 92c56a1..19a31a6 100644 --- a/src/complexagent.rs +++ b/src/complexagent.rs @@ -1,4 +1,4 @@ -use crate::{agent::Agent, board::Board, future_moves::FutureMoves, piece::Piece}; +use crate::{agent::Agent, board::Board, logic::future_moves::FutureMoves, piece::Piece}; pub struct ComplexAgent { color: Piece, diff --git a/src/lib.rs b/src/lib.rs index 4a154eb..a964252 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -2,8 +2,7 @@ mod agent; mod bitboard; pub mod board; mod complexagent; -pub mod future_moves; mod game; +pub mod logic; mod misc; -mod r#move; pub mod piece; diff --git a/src/future_moves.rs b/src/logic/future_moves.rs similarity index 99% rename from src/future_moves.rs rename to src/logic/future_moves.rs index 31c6576..e06519f 100644 --- a/src/future_moves.rs +++ b/src/logic/future_moves.rs @@ -2,8 +2,8 @@ use indicatif::{ProgressIterator, ProgressStyle}; use crate::{ board::{Board, Winner}, + logic::r#move::Move, piece::Piece, - r#move::Move, }; pub struct FutureMoves { @@ -192,7 +192,7 @@ impl FutureMoves { // TODO! impl dynamic sorting based on children's states, maybe it propegates // upwards using the `parent` field // SAFETY! the sort_by_key function should not modify anything - unsafe { (&mut *(self as *mut Self)).arena.get_unchecked_mut(idx) } + unsafe { (*(self as *mut Self)).arena.get_unchecked_mut(idx) } .children // negative because we want the largest value in the first index .sort_by_key(|&x| -self.arena[x].value); diff --git a/src/logic/mod.rs b/src/logic/mod.rs new file mode 100644 index 0000000..52ba3c7 --- /dev/null +++ b/src/logic/mod.rs @@ -0,0 +1,2 @@ +pub mod future_moves; +mod r#move; diff --git a/src/move.rs b/src/logic/move.rs similarity index 100% rename from src/move.rs rename to src/logic/move.rs diff --git a/src/main.rs b/src/main.rs index 679f9b9..ad8470c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -5,10 +5,9 @@ mod agent; mod bitboard; mod board; mod complexagent; -pub mod future_moves; mod game; +mod logic; mod misc; -mod r#move; mod piece; fn main() {