Skip to content

Switch to static piece arrays #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
richardjs wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Switch to static piece arrays #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
851b49f
Begin moving to a static piece array in State (i.e. the piece array i…
richardjs May 1, 2023
9ae4915
Fix coords.c and simulate.c to work with static piece arrays (but in …
richardjs May 1, 2023
3b63925
Fix some errors in state.c
richardjs May 1, 2023
65bd4f0
Add action.from back (the piecei for places is stored in action.from.r)
richardjs May 1, 2023
b3f1e72
Remove test for queen cache, since we no longer have it
richardjs May 1, 2023
88635c5
Merge branch 'master' into static-piece-arrays
richardjs May 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/book.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const struct Action* opening_move(const struct State* state)

if (state->piece_count[P1] == 0 || state->piece_count[P2] == 0) {
for (int i = 0; i < state->action_count; i++) {
switch (state->actions[i].from.r) {
switch (state->pieces[state->turn][state->actions[i].from.r].type) {
case BEETLE:
case GRASSHOPPER:
case SPIDER:
Expand Down
3 changes: 3 additions & 0 deletions src/coords.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,9 @@ bool Coords_map_adjacent(const struct Coords* coords, const struct Coords* other

bool Coords_adjacent(const struct Coords* coords, const struct Coords* other)
{
if (coords->q == IN_HAND || other->q == IN_HAND) {
return false;
}
return Coords_map_adjacent(coords, other);
}

Expand Down
10 changes: 5 additions & 5 deletions src/simulate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ int State_beetle_seek_path(
const struct Piece* piece,
struct Coords* path)
{
if (!state->queens[!piece->player]) {
if (state->pieces[!piece->player][QUEEN_INDEX].coords.q == IN_HAND) {
return -1;
}
struct Coords target = state->queens[!piece->player]->coords;
struct Coords target = state->pieces[!piece->player][QUEEN_INDEX].coords;

struct Coords queue[MAX_PIECES];
unsigned int queue_size = 0;
Expand Down Expand Up @@ -165,7 +165,8 @@ float State_simulate(struct State* state,

if (state->beetle_move_count
&& (rand() / (float)RAND_MAX) < options->beetle_seek_move_bias) {
struct Piece* beetle = state->beetles[state->turn][rand() % state->beetle_count[state->turn]];

struct Piece* beetle = &state->pieces[state->turn][BEETLE_INDEX + rand() % (NUM_BEETLES - state->hands[state->turn][BEETLE])];
struct Coords path[MAX_PIECES];
int path_size = State_beetle_seek_path(state, beetle, path);

Expand Down Expand Up @@ -242,8 +243,7 @@ float State_simulate(struct State* state,

if (action->from.q != PLACE_ACTION
&& action->from.q != PASS_ACTION
&& state->queens[!state->turn]
&& Coords_adjacent(&action->from, &state->queens[!state->turn]->coords)
&& Coords_adjacent(&action->from, &state->pieces[!state->turn][QUEEN_INDEX].coords)
&& (rand() / (float)RAND_MAX) < options->from_queen_pass) {
#ifdef WATCH_SIMS
printf("from queen pass\n");
Expand Down
Loading