Skip to content

Commit

Permalink
Broke out eval_move into separate function
Browse files Browse the repository at this point in the history 
Broke out eval_move into separate function
  • Loading branch information
@Kapsyloffer
Kapsyloffer authored Feb 26, 2024
2 parents fa49f8d + 00dc721 commit 0f9e7cc
Showing 1 changed file with 88 additions and 82 deletions.
170 changes: 88 additions & 82 deletions src/ai/chum_bucket.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,17 @@ impl ChumBucket {
let opp_w = *game.get_board(opp_color, Tile::White).unwrap();

//Evaluate for each.
self.eval_move(&home_b, &opp_w, game, &ai_color);
self.eval_move(&home_b, &home_w, game, &ai_color);
self.eval_move(&home_w, &opp_b, game, &ai_color);
self.eval_move(&home_w, &home_b, game, &ai_color);
self.check_each_move(&home_b, &opp_w, game, &ai_color);
self.check_each_move(&home_b, &home_w, game, &ai_color);
self.check_each_move(&home_w, &opp_b, game, &ai_color);
self.check_each_move(&home_w, &home_b, game, &ai_color);

return (self.best_move_p.clone().unwrap(), self.best_move_a.clone().unwrap());
}

pub fn eval_move(&mut self, home_board: &Board, opp_board: &Board, game_state: &Game, ai_color: &Tile) {
pub fn check_each_move(&mut self, home_board: &Board, opp_board: &Board, game_state: &Game, ai_color: &Tile) {
let rock_positions_passive = Self::get_rock_positions(&home_board, *ai_color);
let rock_positions_aggressive = Self::get_rock_positions(&opp_board, *ai_color);
let mut range_count: i64 = 0; //Not working rn.

//Runs for each rock on home.
for passive_pos in rock_positions_passive {
Expand All @@ -50,91 +49,98 @@ impl ChumBucket {
//Get the move deltas
for new_passive_pos in moves {
//Deltas
let dy = new_passive_pos.1 - passive_pos.1;
let dx = new_passive_pos.0 - passive_pos.0;
let dy = new_passive_pos.1 - passive_pos.1;

//Try to make moves
for aggr_pos in &rock_positions_aggressive {
//So that we don't mess up the og states.
let mut home_clone = home_board.clone();
let mut opp_clone = opp_board.clone();

//New aggr pos defined using deltas
let new_aggr_pos: (i8, i8) = (aggr_pos.0 + dx, aggr_pos.1 + dy);
self.eval_move(home_board, opp_board, game_state, ai_color, passive_pos, new_passive_pos, *aggr_pos, new_aggr_pos);
}
}
}
}

//If both true both moves are valid.
let moved_p = Tile::passive_move(&mut home_clone, passive_pos, new_passive_pos);
let moved_a = Tile::aggressive_move(&mut opp_clone, *aggr_pos, new_aggr_pos);

//Evaluate.
if moved_p && moved_a {
//Gamestate clone so that we don't mess anything up.
let game_clone = game_state.clone();

let mut rock_count: i8 = 0;

//Replace used boards on game_state, then eval
for mut game_board in game_clone.get_boards() {
//If both home and colour match for home_b
if game_board.get_home() == home_clone.get_home()
&& game_board.get_color() == home_clone.get_color() {
game_board.set_state(home_clone.get_state());
}

//If both home and colour match for opp_b
if game_board.get_home() == opp_clone.get_home()
&& game_board.get_color() == opp_clone.get_color() {
game_board.set_state(opp_clone.get_state());
}

//Opponent colour
let opp_colour = Self::get_opponent(*ai_color);

//Eval range, but only for homeboards.
if game_board.get_home() == *ai_color {
range_count += Self::get_rock_positions(&game_board, *ai_color).len() as i64;
}
//TODO: Only for homeboards.

//Eval Opponent rocks
rock_count += Self::get_rock_positions(&game_board, opp_colour).len() as i8;
}

if rock_count < self.best_rock_count ||
rock_count <= self.best_rock_count && range_count > self.best_range {
//Obv very good
self.best_rock_count = rock_count;
self.best_range = range_count;

let move_p = MovementAction::new(home_clone.get_color(),
home_clone.get_home(),
passive_pos.0,
passive_pos.1,
new_passive_pos.0,
new_passive_pos.1,
false,
String::from("ChumBucketAI")
);
let move_a = MovementAction::new(opp_clone.get_color(),
opp_clone.get_home(),
aggr_pos.0,
aggr_pos.1,
new_aggr_pos.0,
new_aggr_pos.1,
true,
String::from("ChumBucketAI")
);

//println!("\nOUR BEST MOVE:\nROCKS:{}\nRANGE:{}\nMOVE_P:\n{:#?}\nMOVE_A:\n{:#?}",
//rock_count, range_count, move_p, move_a);

self.best_move_p = Some(move_p);
self.best_move_a = Some(move_a);
}
}
fn eval_move(&mut self, home_board: &Board, opp_board: &Board, game_state: &Game, ai_color: &Tile, passive_pos: (i8, i8), new_passive_pos: (i8, i8), aggr_pos: (i8, i8), new_aggr_pos: (i8, i8)) {
//So that we don't mess up the og states.
let mut home_clone = home_board.clone();
let mut opp_clone = opp_board.clone();

//If both true both moves are valid.
let moved_p = Tile::passive_move(&mut home_clone, passive_pos, new_passive_pos);
let moved_a = Tile::aggressive_move(&mut opp_clone, aggr_pos, new_aggr_pos);

//Evaluate.
if moved_p && moved_a {
//Gamestate clone so that we don't mess anything up.
let game_clone = game_state.clone();

let mut rock_count: i8 = 0;
let mut range_count: i64 = 0; //Not working rn.

//Replace used boards on game_state, then eval
for mut game_board in game_clone.get_boards() {
//If both home and colour match for home_b
if game_board.get_home() == home_clone.get_home()
&& game_board.get_color() == home_clone.get_color() {
game_board.set_state(home_clone.get_state());
}

//If both home and colour match for opp_b
if game_board.get_home() == opp_clone.get_home()
&& game_board.get_color() == opp_clone.get_color() {
game_board.set_state(opp_clone.get_state());
}

//Opponent colour
let opp_colour = Self::get_opponent(*ai_color);

//Eval range, but only for homeboards.
if game_board.get_home() == *ai_color {
range_count += Self::get_rock_positions(&game_board, *ai_color).len() as i64;
}

//Eval Opponent rocks
rock_count += Self::get_rock_positions(&game_board, opp_colour).len() as i8;
}

//TODO: Eval based on boards with advantage and disadvantage
//TODO: Eval moves based on if rock can get pushed off
//TODO: Check if a win is possible, if yes, go for it.
if rock_count < self.best_rock_count
//|| rock_count <= self.best_rock_count && range_count > self.best_range
{
//Obv very good
self.best_rock_count = rock_count;
self.best_range = range_count;

let move_p = MovementAction::new(home_clone.get_color(),
home_clone.get_home(),
passive_pos.0,
passive_pos.1,
new_passive_pos.0,
new_passive_pos.1,
false,
String::from("ChumBucketAI")
);
let move_a = MovementAction::new(opp_clone.get_color(),
opp_clone.get_home(),
aggr_pos.0,
aggr_pos.1,
new_aggr_pos.0,
new_aggr_pos.1,
true,
String::from("ChumBucketAI")
);

//println!("\nOUR BEST MOVE:\nROCKS:{}\nRANGE:{}\nMOVE_P:\n{:#?}\nMOVE_A:\n{:#?}",
//rock_count, range_count, move_p, move_a);

self.best_move_p = Some(move_p);
self.best_move_a = Some(move_a);
}
}

}

pub fn get_rock_positions(b: &Board, target: Tile) -> Vec<(i8, i8)> {
Expand Down

0 comments on commit 0f9e7cc

Please sign in to comment.