Assorted code style of latest commits

[stockfish] / src / movepick.cpp

diff --git a/src/movepick.cpp b/src/movepick.cpp
index d6a40d70af4c7d2d37305fe1f60dde62d6f51791..3baf4f700b59cd52ab30c5a13d625bdbecd2027e 100644 (file)
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -68,13 +68,12 @@ namespace {
 /// ordering is at the current node.
 
 MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& h, const CounterMovesHistoryStats& cmh,
-                       Move* cm, Move* fm, Search::Stack* s) : pos(p), history(h), counterMovesHistory(cmh), depth(d) {
+                       Move* cm, Search::Stack* s) : pos(p), history(h), counterMovesHistory(cmh), depth(d) {
 
   assert(d > DEPTH_ZERO);
 
   endBadCaptures = moves + MAX_MOVES - 1;
   countermoves = cm;
-  followupmoves = fm;
   ss = s;
 
   if (pos.checkers())
@@ -162,9 +161,9 @@ void MovePicker::score<CAPTURES>() {
 
 template<>
 void MovePicker::score<QUIETS>() {
-  Square prevMoveSq = to_sq((ss-1)->currentMove);
-  Piece prevMovePiece = pos.piece_on(prevMoveSq);
-  const HistoryStats &cmh = counterMovesHistory[prevMovePiece][prevMoveSq];
+
+  Square prevSq = to_sq((ss-1)->currentMove);
+  const HistoryStats& cmh = counterMovesHistory[pos.piece_on(prevSq)][prevSq];
 
   for (auto& m : *this)
       m.value =  history[pos.moved_piece(m)][to_sq(m)]
@@ -211,9 +210,8 @@ void MovePicker::generate_next_stage() {
       killers[0] = ss->killers[0];
       killers[1] = ss->killers[1];
       killers[2].move = killers[3].move = MOVE_NONE;
-      killers[4].move = killers[5].move = MOVE_NONE;
 
-      // In SMP case countermoves[] and followupmoves[] could have duplicated entries
+      // In SMP case countermoves[] could have duplicated entries
       // in rare cases (less than 1 out of a million). This is harmless.
 
       // Be sure countermoves and followupmoves are different from killers
@@ -221,13 +219,6 @@ void MovePicker::generate_next_stage() {
           if (   countermoves[i] != killers[0]
               && countermoves[i] != killers[1])
               *endMoves++ = countermoves[i];
-
-      for (int i = 0; i < 2; ++i)
-          if (   followupmoves[i] != killers[0]
-              && followupmoves[i] != killers[1]
-              && followupmoves[i] != killers[2]
-              && followupmoves[i] != killers[3])
-              *endMoves++ = followupmoves[i];
       break;
 
   case QUIETS_1_S1:
@@ -321,9 +312,7 @@ Move MovePicker::next_move<false>() {
               && move != killers[0]
               && move != killers[1]
               && move != killers[2]
-              && move != killers[3]
-              && move != killers[4]
-              && move != killers[5])
+              && move != killers[3])
               return move;
           break;