threadID = th;
nodes = 0;
- assert(is_ok());
+ assert(pos_is_ok());
}
Position::Position(const string& fen, bool isChess960, int th) {
st->npMaterial[WHITE] = compute_non_pawn_material(WHITE);
st->npMaterial[BLACK] = compute_non_pawn_material(BLACK);
- assert(is_ok());
+ assert(pos_is_ok());
}
return hidden_checkers<false>();
}
-/// Position::attackers_to() computes a bitboard containing all pieces which
-/// attacks a given square.
-
-Bitboard Position::attackers_to(Square s) const {
-
- return (attacks_from<PAWN>(s, BLACK) & pieces(PAWN, WHITE))
- | (attacks_from<PAWN>(s, WHITE) & pieces(PAWN, BLACK))
- | (attacks_from<KNIGHT>(s) & pieces(KNIGHT))
- | (attacks_from<ROOK>(s) & pieces(ROOK, QUEEN))
- | (attacks_from<BISHOP>(s) & pieces(BISHOP, QUEEN))
- | (attacks_from<KING>(s) & pieces(KING));
-}
+/// Position::attackers_to() computes a bitboard of all pieces which attacks a
+/// given square. Slider attacks use occ bitboard as occupancy.
Bitboard Position::attackers_to(Square s, Bitboard occ) const {
| (attacks_from<KING>(s) & pieces(KING));
}
-/// Position::attacks_from() computes a bitboard of all attacks
-/// of a given piece put in a given square.
-
-Bitboard Position::attacks_from(Piece p, Square s) const {
-
- assert(square_is_ok(s));
-
- switch (p)
- {
- case WB: case BB: return attacks_from<BISHOP>(s);
- case WR: case BR: return attacks_from<ROOK>(s);
- case WQ: case BQ: return attacks_from<QUEEN>(s);
- default: return StepAttacksBB[p][s];
- }
-}
+/// Position::attacks_from() computes a bitboard of all attacks of a given piece
+/// put in a given square. Slider attacks use occ bitboard as occupancy.
Bitboard Position::attacks_from(Piece p, Square s, Bitboard occ) {
else if (!bit_is_set(attacks_from(pc, from), to))
return false;
+ // Evasions generator already takes care to avoid some kind of illegal moves
+ // and pl_move_is_legal() relies on this. So we have to take care that the
+ // same kind of moves are filtered out here.
if (in_check())
{
// In case of king moves under check we have to remove king so to catch
if (is_promotion(m))
{
clear_bit(&b, from);
-
- switch (promotion_piece_type(m))
- {
- case KNIGHT:
- return bit_is_set(attacks_from<KNIGHT>(to), ksq);
- case BISHOP:
- return bit_is_set(bishop_attacks_bb(to, b), ksq);
- case ROOK:
- return bit_is_set(rook_attacks_bb(to, b), ksq);
- case QUEEN:
- return bit_is_set(queen_attacks_bb(to, b), ksq);
- default:
- assert(false);
- }
+ return bit_is_set(attacks_from(Piece(promotion_piece_type(m)), to, b), ksq);
}
// En passant capture with check ? We have already handled the case
sideToMove = flip(sideToMove);
st->value += (sideToMove == WHITE ? TempoValue : -TempoValue);
- assert(is_ok());
+ assert(pos_is_ok());
}
sideToMove = flip(sideToMove);
st->value += (sideToMove == WHITE ? TempoValue : -TempoValue);
- assert(is_ok());
+ assert(pos_is_ok());
}
// Finally point our state pointer back to the previous state
st = st->previous;
- assert(is_ok());
+ assert(pos_is_ok());
}
// Finally point our state pointer back to the previous state
st = st->previous;
- assert(is_ok());
+ assert(pos_is_ok());
}
st->pliesFromNull = 0;
st->value += (sideToMove == WHITE) ? TempoValue : -TempoValue;
- assert(is_ok());
+ assert(pos_is_ok());
}
sideToMove = flip(sideToMove);
st->rule50--;
- assert(is_ok());
+ assert(pos_is_ok());
}
// Early return if SEE cannot be negative because captured piece value
// is not less then capturing one. Note that king moves always return
// here because king midgame value is set to 0.
- if (piece_value_midgame(piece_on(to)) >= piece_value_midgame(piece_on(from)))
+ if (PieceValueMidgame[piece_on(to)] >= PieceValueMidgame[piece_on(from)])
return 1;
return see(m);
for (Color c = WHITE; c <= BLACK; c++)
for (PieceType pt = PAWN; pt <= QUEEN; pt++)
- for (int i = 0, cnt = piece_count(c, pt); i < cnt; i++)
+ for (int i = 0; i < piece_count(c, pt); i++)
result ^= zobrist[c][pt][i];
return result;
}
-/// Position::init() is a static member function which initializes at
-/// startup the various arrays used to compute hash keys and the piece
-/// square tables. The latter is a two-step operation: First, the white
-/// halves of the tables are copied from the MgPST[][] and EgPST[][] arrays.
-/// Second, the black halves of the tables are initialized by flipping
-/// and changing the sign of the corresponding white scores.
+/// Position::init() is a static member function which initializes at startup
+/// the various arrays used to compute hash keys and the piece square tables.
+/// The latter is a two-step operation: First, the white halves of the tables
+/// are copied from PSQT[] tables. Second, the black halves of the tables are
+/// initialized by flipping and changing the sign of the white scores.
void Position::init() {
zobExclusion = rk.rand<Key>();
for (Piece p = WP; p <= WK; p++)
+ {
+ Score ps = make_score(PieceValueMidgame[p], PieceValueEndgame[p]);
+
for (Square s = SQ_A1; s <= SQ_H8; s++)
{
- pieceSquareTable[p][s] = make_score(MgPST[p][s], EgPST[p][s]);
+ pieceSquareTable[p][s] = ps + PSQT[p][s];
pieceSquareTable[p+8][flip(s)] = -pieceSquareTable[p][s];
}
+ }
}
st->npMaterial[WHITE] = compute_non_pawn_material(WHITE);
st->npMaterial[BLACK] = compute_non_pawn_material(BLACK);
- assert(is_ok());
+ assert(pos_is_ok());
}
-/// Position::is_ok() performs some consitency checks for the position object.
+/// Position::pos_is_ok() performs some consitency checks for the position object.
/// This is meant to be helpful when debugging.
-bool Position::is_ok(int* failedStep) const {
+bool Position::pos_is_ok(int* failedStep) const {
// What features of the position should be verified?
const bool debugAll = false;