Remove redundancy in definitions of attack helpers

[stockfish] / src / position.cpp

diff --git a/src/position.cpp b/src/position.cpp
index b9acc645847471f42e4a8101d1d439c2634fdb73..8c9906e2f6b65e817002d84ec8a8364398467e88 100644 (file)
--- a/src/position.cpp
+++ b/src/position.cpp
@@ -102,7 +102,7 @@ Position::Position(const Position& pos, int th) {
   threadID = th;
   nodes = 0;
 
-  assert(is_ok());
+  assert(pos_is_ok());
 }
 
 Position::Position(const string& fen, bool isChess960, int th) {
@@ -207,7 +207,7 @@ void Position::from_fen(const string& fenStr, bool isChess960) {
   st->npMaterial[WHITE] = compute_non_pawn_material(WHITE);
   st->npMaterial[BLACK] = compute_non_pawn_material(BLACK);
 
-  assert(is_ok());
+  assert(pos_is_ok());
 }
 
 
@@ -400,18 +400,8 @@ Bitboard Position::discovered_check_candidates() const {
   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 {
 
@@ -423,21 +413,8 @@ 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) {
 
@@ -971,7 +948,7 @@ void Position::do_move(Move m, StateInfo& newSt, const CheckInfo& ci, bool moveI
   sideToMove = flip(sideToMove);
   st->value += (sideToMove == WHITE ?  TempoValue : -TempoValue);
 
-  assert(is_ok());
+  assert(pos_is_ok());
 }
 
 
@@ -1134,7 +1111,7 @@ void Position::do_castle_move(Move m) {
   sideToMove = flip(sideToMove);
   st->value += (sideToMove == WHITE ?  TempoValue : -TempoValue);
 
-  assert(is_ok());
+  assert(pos_is_ok());
 }
 
 
@@ -1235,7 +1212,7 @@ void Position::undo_move(Move m) {
   // Finally point our state pointer back to the previous state
   st = st->previous;
 
-  assert(is_ok());
+  assert(pos_is_ok());
 }
 
 
@@ -1307,7 +1284,7 @@ void Position::undo_castle_move(Move m) {
   // Finally point our state pointer back to the previous state
   st = st->previous;
 
-  assert(is_ok());
+  assert(pos_is_ok());
 }
 
 
@@ -1342,7 +1319,7 @@ void Position::do_null_move(StateInfo& backupSt) {
   st->pliesFromNull = 0;
   st->value += (sideToMove == WHITE) ?  TempoValue : -TempoValue;
 
-  assert(is_ok());
+  assert(pos_is_ok());
 }
 
 
@@ -1364,7 +1341,7 @@ void Position::undo_null_move() {
   sideToMove = flip(sideToMove);
   st->rule50--;
 
-  assert(is_ok());
+  assert(pos_is_ok());
 }
 
 
@@ -1689,12 +1666,11 @@ bool Position::is_mate() const {
 }
 
 
-/// 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() {
 
@@ -1715,11 +1691,15 @@ void Position::init() {
   zobExclusion  = rk.rand<Key>();
 
   for (Piece p = WP; p <= WK; p++)
+  {
+      Score ps = make_score(piece_value_midgame(p), piece_value_endgame(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];
       }
+  }
 }
 
 
@@ -1771,14 +1751,14 @@ void Position::flip_me() {
   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;