titaniumtown/othello
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve prop logic

Browse Source
This commit is contained in:
Simon Gardling 2025-01-24 21:58:38 -05:00
parent 7cfd5b5733
commit 283158b00f
Signed by: titaniumtown
GPG Key ID: 9AB28AC10ECE533D
1 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/repr.rs
View File

@ -30,12 +30,11 @@ impl Board {
&self.board[i][j] &self.board[i][j]
} }
fn place_unchecked(&mut self, i: usize, j: usize, piece: Piece) { const fn place_unchecked(&mut self, i: usize, j: usize, piece: Piece) {
*self.get_mut(i, j) = Some(piece); *self.get_mut(i, j) = Some(piece);
} }
// TODO! make this better and actually readable // TODO! make this better and actually readable
// TODO! propegate from propegated pieces
fn propegate_from(&mut self, i: usize, j: usize) { fn propegate_from(&mut self, i: usize, j: usize) {
// returns if that place is empty // returns if that place is empty
let Some(starting_color) = *self.get(i, j) else { let Some(starting_color) = *self.get(i, j) else {
@ -50,44 +49,46 @@ impl Board {
for i_range in i_ranges { for i_range in i_ranges {
let mut chain_length: usize = 0; let mut chain_length: usize = 0;
for new_i in i_range.clone() { for &new_i in &i_range {
match self.get(new_i, j) { let Some(piece) = self.get(new_i, j) else {
Some(piece) => { break;
if piece == &starting_color { };
if chain_length > 0 { if piece == &starting_color {
// fill all opposite colors with this color if chain_length > 0 {
i_range.get(..chain_length).unwrap().iter().for_each(|i_o| { // fill all opposite colors with this color
self.place_and_prop_unchecked(*i_o, j, starting_color) let Some(i_o_s) = i_range.get(..chain_length) else {
});
}
break; break;
} else { };
chain_length += 1; for i_o in i_o_s {
self.place_and_prop_unchecked(*i_o, j, starting_color);
} }
} }
None => break, break;
} else {
chain_length += 1;
} }
} }
} }
for j_range in j_ranges { for j_range in j_ranges {
let mut chain_length: usize = 0; let mut chain_length: usize = 0;
for new_j in j_range.clone() { for &new_j in &j_range {
match self.get(i, new_j) { let Some(piece) = self.get(i, new_j) else {
Some(piece) => { break;
if piece == &starting_color { };
if chain_length > 0 { if piece == &starting_color {
// fill all opposite colors with this color if chain_length > 0 {
j_range.get(..chain_length).unwrap().iter().for_each(|j_o| { let Some(j_o_s) = j_range.get(..chain_length) else {
self.place_and_prop_unchecked(i, *j_o, starting_color)
});
}
break; break;
} else { };
chain_length += 1; // fill all opposite colors with this color
for j_o in j_o_s {
self.place_and_prop_unchecked(i, *j_o, starting_color);
} }
} }
None => break, break;
} else {
chain_length += 1;
} }
} }
} }
@ -114,6 +115,7 @@ impl Board {
#[cfg(test)] #[cfg(test)]
mod test { mod test {
use super::*; use super::*;
#[test] #[test]
fn place_and_get() { fn place_and_get() {
let mut board = Board::new(); let mut board = Board::new();