WebSVN – Games.Chess Giants – Diff – /engine-stockfish/position.h

   Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
-  Copyright (C) 2015-2018 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
+  Copyright (C) 2015-2019 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
   Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   Key    materialKey;
   Value  nonPawnMaterial[COLOR_NB];
   int    castlingRights;
   int    rule50;
   int    pliesFromNull;
-  Score  psq;
   Square epSquare;
   // Not copied when making a move (will be recomputed anyhow)
   Key        key;
   Bitboard   checkersBB;
   Piece      capturedPiece;
   StateInfo* previous;
   Bitboard   blockersForKing[COLOR_NB];
-  Bitboard   pinnersForKing[COLOR_NB];
+  Bitboard   pinners[COLOR_NB];
   Bitboard   checkSquares[PIECE_TYPE_NB];
 };
 /// A list to keep track of the position states along the setup moves (from the
 /// start position to the position just before the search starts). Needed by
   bool castling_impeded(CastlingRight cr) const;
   Square castling_rook_square(CastlingRight cr) const;
   // Checking
   Bitboard checkers() const;
-  Bitboard discovered_check_candidates() const;
-  Bitboard pinned_pieces(Color c) const;
+  Bitboard blockers_for_king(Color c) const;
   Bitboard check_squares(PieceType pt) const;
   // Attacks to/from a given square
   Bitboard attackers_to(Square s) const;
   Bitboard attackers_to(Square s, Bitboard occupied) const;
   Color side_to_move() const;
   int game_ply() const;
   bool is_chess960() const;
   Thread* this_thread() const;
   bool is_draw(int ply) const;
+  bool has_game_cycle(int ply) const;
+  bool has_repeated() const;
   int rule50_count() const;
   Score psq_score() const;
   Value non_pawn_material(Color c) const;
   Value non_pawn_material() const;
   int castlingRightsMask[SQUARE_NB];
   Square castlingRookSquare[CASTLING_RIGHT_NB];
   Bitboard castlingPath[CASTLING_RIGHT_NB];
   int gamePly;
   Color sideToMove;
+  Score psq;
   Thread* thisThread;
   StateInfo* st;
   bool chess960;
 };
+namespace PSQT {
+  extern Score psq[PIECE_NB][SQUARE_NB];
+}
 extern std::ostream& operator<<(std::ostream& os, const Position& pos);
 inline Color Position::side_to_move() const {
   return sideToMove;
 }
 inline bool Position::empty(Square s) const {
   return board[s] == NO_PIECE;
+}
 inline Piece Position::piece_on(Square s) const {
   return board[s];
 }
 inline Piece Position::moved_piece(Move m) const {
   return board[from_sq(m)];
 }
 inline Bitboard Position::pieces() const {
   return byTypeBB[ALL_PIECES];
 }
 inline Bitboard Position::pieces(PieceType pt) const {
   return byTypeBB[pt];
 }
 inline Bitboard Position::pieces(PieceType pt1, PieceType pt2) const {
   return byTypeBB[pt1] | byTypeBB[pt2];
+}
 inline Bitboard Position::pieces(Color c) const {
   return byTypeBB[ALL_PIECES] & castlingPath[cr];
+}
 inline Square Position::castling_rook_square(CastlingRight cr) const {
   return castlingRookSquare[cr];
 }
 template<PieceType Pt>
 inline Bitboard Position::attacks_from(Square s) const {
   assert(Pt != PAWN);
   return  Pt == BISHOP || Pt == ROOK ? attacks_bb<Pt>(s, byTypeBB[ALL_PIECES])
+}
 template<>
 inline Bitboard Position::attacks_from<PAWN>(Square s, Color c) const {
   return PawnAttacks[c][s];
 }
 inline Bitboard Position::attacks_from(PieceType pt, Square s) const {
   return attacks_bb(pt, s, byTypeBB[ALL_PIECES]);
 }
 inline Bitboard Position::attackers_to(Square s) const {
   return attackers_to(s, byTypeBB[ALL_PIECES]);
 }
 inline Bitboard Position::checkers() const {
   return st->checkersBB;
+}
-inline Bitboard Position::discovered_check_candidates() const {
-  return st->blockersForKing[~sideToMove] & pieces(sideToMove);
-}
-inline Bitboard Position::pinned_pieces(Color c) const {
+inline Bitboard Position::blockers_for_king(Color c) const {
-  return st->blockersForKing[c] & pieces(c);
+  return st->blockersForKing[c];
+}
 inline Bitboard Position::check_squares(PieceType pt) const {
   return st->checkSquares[pt];
+}
 inline Key Position::material_key() const {
   return st->materialKey;
+}
 inline Score Position::psq_score() const {
-  return st->psq;
+  return psq;
+}
 inline Value Position::non_pawn_material(Color c) const {
   return st->nonPawnMaterial[c];
+}
   byTypeBB[type_of(pc)] |= s;
   byColorBB[color_of(pc)] |= s;
   index[s] = pieceCount[pc]++;
   pieceList[pc][index[s]] = s;
   pieceCount[make_piece(color_of(pc), ALL_PIECES)]++;
+  psq += PSQT::psq[pc][s];
+}
 inline void Position::remove_piece(Piece pc, Square s) {
   // WARNING: This is not a reversible operation. If we remove a piece in
   Square lastSquare = pieceList[pc][--pieceCount[pc]];
   index[lastSquare] = index[s];
   pieceList[pc][index[lastSquare]] = lastSquare;
   pieceList[pc][pieceCount[pc]] = SQ_NONE;
   pieceCount[make_piece(color_of(pc), ALL_PIECES)]--;
+  psq -= PSQT::psq[pc][s];
+}
 inline void Position::move_piece(Piece pc, Square from, Square to) {
   // index[from] is not updated and becomes stale. This works as long as index[]
   // is accessed just by known occupied squares.
-  Bitboard from_to_bb = SquareBB[from] ^ SquareBB[to];
+  Bitboard fromTo = SquareBB[from] ^ SquareBB[to];
-  byTypeBB[ALL_PIECES] ^= from_to_bb;
+  byTypeBB[ALL_PIECES] ^= fromTo;
-  byTypeBB[type_of(pc)] ^= from_to_bb;
+  byTypeBB[type_of(pc)] ^= fromTo;
-  byColorBB[color_of(pc)] ^= from_to_bb;
+  byColorBB[color_of(pc)] ^= fromTo;
   board[from] = NO_PIECE;
   board[to] = pc;
   index[to] = index[from];
   pieceList[pc][index[to]] = to;
+  psq += PSQT::psq[pc][to] - PSQT::psq[pc][from];
+}
 inline void Position::do_move(Move m, StateInfo& newSt) {
   do_move(m, newSt, gives_check(m));
+}

Subversion Repositories Games.Chess Giants

Games.Chess Giants/engine-stockfish/position.h – Rev 169 → 185