diff options
Diffstat (limited to 'include/nn1986.c')
| -rw-r--r-- | include/nn1986.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/include/nn1986.c b/include/nn1986.c index b9c551c..117a034 100644 --- a/include/nn1986.c +++ b/include/nn1986.c @@ -28,22 +28,22 @@ static float dense1[DENSE_NUM]; static float output[2]; #define RELU(x) ((x) = ((x) < 0) ? 0 : (x)) -float nn1986_evaluate_black_win(void) { +float nn1986_evaluate_black_win(tak_state_p state) { /* --------------- * * Populate input * * --------------- */ - for (unsigned int y = 0; y < board_size; y++) { - for (unsigned int x = 0; x < board_size; x++) { - const unsigned int loc = x + y * board_size; - const unsigned int count = COUNT_AT(loc); + for (unsigned int y = 0; y < state->board_size; y++) { + for (unsigned int x = 0; x < state->board_size; x++) { + const unsigned int loc = x + y * state->board_size; + const unsigned int count = COUNT_AT(state, loc); float lookup = 0; if (count > 0) { - if (STONE_AT(loc) == STONE_STANDING) { - lookup = (colours[loc] & 1) ? +0.25 : -0.25; - } else if (STONE_AT(loc) == STONE_CAPSTONE) { - lookup = (colours[loc] & 1) ? +1.00 : -1.00; + if (STONE_AT(state, loc) == STONE_STANDING) { + lookup = (state->colours[loc] & 1) ? +0.25 : -0.25; + } else if (STONE_AT(state, loc) == STONE_CAPSTONE) { + lookup = (state->colours[loc] & 1) ? +1.00 : -1.00; } else { - lookup = (colours[loc] & 1) ? +0.50 : -0.50; + lookup = (state->colours[loc] & 1) ? +0.50 : -0.50; } } cur_board[3 + loc] = lookup; @@ -53,9 +53,9 @@ float nn1986_evaluate_black_win(void) { * Convolution layer * * ------------------ */ // Add input of flat counts and ply parity - cur_board[0] = (ply & 1) ? 1 : -1; - cur_board[1] = (float)(white_count & 127) / 21.0; - cur_board[2] = (float)(black_count & 127) / 21.0; + cur_board[0] = (state->ply & 1) ? 1 : -1; + cur_board[1] = (float)(state->white_count & 127) / 21.0; + cur_board[2] = (float)(state->black_count & 127) / 21.0; /* ------------------ * * First dense layer * * ------------------ */ |