Merge remote-tracking branch 'upstream/master' into HEAD

[stockfish] / src / position.cpp

diff --git a/src/position.cpp b/src/position.cpp
index 5ce7da22894568a2e60c68cd2606fdc01e27845d..13010c1a43f49571193d745a144ad92a4867bb9d 100644 (file)
--- a/src/position.cpp
+++ b/src/position.cpp
@@ -197,7 +197,6 @@ Position& Position::set(const string& fenStr, bool isChess960, StateInfo* si, Th
 
   std::memset(this, 0, sizeof(Position));
   std::memset(si, 0, sizeof(StateInfo));
-  std::fill_n(&pieceList[0][0], sizeof(pieceList) / sizeof(Square), SQ_NONE);
   st = si;
 
   ss >> std::noskipws;
@@ -284,8 +283,6 @@ Position& Position::set(const string& fenStr, bool isChess960, StateInfo* si, Th
   st->accumulator.state[WHITE] = Eval::NNUE::INIT;
   st->accumulator.state[BLACK] = Eval::NNUE::INIT;
 
-  assert(pos_is_ok());
-
   return *this;
 }
 
@@ -1327,16 +1324,10 @@ bool Position::pos_is_ok() const {
       assert(0 && "pos_is_ok: State");
 
   for (Piece pc : Pieces)
-  {
       if (   pieceCount[pc] != popcount(pieces(color_of(pc), type_of(pc)))
           || pieceCount[pc] != std::count(board, board + SQUARE_NB, pc))
           assert(0 && "pos_is_ok: Pieces");
 
-      for (int i = 0; i < pieceCount[pc]; ++i)
-          if (board[pieceList[pc][i]] != pc || index[pieceList[pc][i]] != i)
-              assert(0 && "pos_is_ok: Index");
-  }
-
   for (Color c : { WHITE, BLACK })
       for (CastlingRights cr : {c & KING_SIDE, c & QUEEN_SIDE})
       {