X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=59b134532e4ec5318884c9b2810d902d0af337cb;hp=bff6ac46f0e029fa3c7ba80cde72e8873877ed45;hb=683e6dc6566719f8737fad9bc30580bb0b4d8d20;hpb=c97104e8540b72ee2c6c9c13d3773d2c0f9ec32f

diff --git a/src/movepick.cpp b/src/movepick.cpp
index bff6ac46..59b13453 100644
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -96,9 +96,6 @@ MovePicker::MovePicker(const Position& p, bool pv, Move ttm,
   else
       phaseIndex = (noCaptures ? NoMovesPhaseIndex : QsearchWithoutChecksPhaseIndex);
 
-  dc = p.discovered_check_candidates(us);
-  pinned = p.pinned_pieces(p.side_to_move());
-
   finished = false;
 }
 
@@ -130,7 +127,7 @@ Move MovePicker::get_next_move() {
         if (ttMove != MOVE_NONE)
         {
             assert(move_is_ok(ttMove));
-            if (move_is_legal(pos, ttMove, pinned))
+            if (move_is_legal(pos, ttMove))
                 return ttMove;
         }
         break;
@@ -139,7 +136,7 @@ Move MovePicker::get_next_move() {
         if (mateKiller != MOVE_NONE)
         {
             assert(move_is_ok(mateKiller));
-            if (move_is_legal(pos, mateKiller, pinned))
+            if (move_is_legal(pos, mateKiller))
                 return mateKiller;
        }
        break;
@@ -151,7 +148,7 @@ Move MovePicker::get_next_move() {
         break;
 
     case PH_BAD_CAPTURES:
-        badCapturesPicked = 0;
+        movesPicked = 0;
         break;
 
     case PH_NONCAPTURES:
@@ -174,7 +171,7 @@ Move MovePicker::get_next_move() {
         break;
 
     case PH_QCHECKS:
-        numOfMoves = generate_checks(pos, moves, dc);
+        numOfMoves = generate_checks(pos, moves);
         movesPicked = 0;
         break;
 
@@ -318,9 +315,11 @@ void MovePicker::score_qcaptures() {
 
 int MovePicker::find_best_index() {
 
-  int bestScore = -10000000, bestIndex = -1;
+  assert(movesPicked < numOfMoves);
 
-  for (int i = movesPicked; i < numOfMoves; i++)
+  int bestIndex = movesPicked, bestScore = moves[movesPicked].score;
+
+  for (int i = movesPicked + 1; i < numOfMoves; i++)
       if (moves[i].score > bestScore)
       {
           bestIndex = i;
@@ -331,6 +330,8 @@ int MovePicker::find_best_index() {
 
 int MovePicker::find_best_index(Bitboard* squares, int values[]) {
 
+  assert(movesPicked < numOfMoves);
+
   int hs;
   Move m;
   Square to;
@@ -378,6 +379,7 @@ Move MovePicker::pick_move_from_list() {
   Move move;
 
   switch (PhaseTable[phaseIndex]) {
+
   case PH_GOOD_CAPTURES:
       assert(!pos.is_check());
       assert(movesPicked >= 0);
@@ -385,16 +387,12 @@ Move MovePicker::pick_move_from_list() {
       while (movesPicked < numOfMoves)
       {
           bestIndex = find_best_index();
-
-          if (bestIndex != -1) // Found a good capture
-          {
-              move = moves[bestIndex].move;
-              moves[bestIndex] = moves[movesPicked++];
-              if (   move != ttMove
-                  && move != mateKiller
-                  && pos.pl_move_is_legal(move, pinned))
-                  return move;
-          }
+          move = moves[bestIndex].move;
+          moves[bestIndex] = moves[movesPicked++];
+          if (   move != ttMove
+              && move != mateKiller
+              && pos.pl_move_is_legal(move))
+              return move;
       }
       break;
 
@@ -409,16 +407,12 @@ Move MovePicker::pick_move_from_list() {
           // been searched and it is not a PV node, we are probably failing low
           // anyway, so we just pick the first move from the list.
           bestIndex = (pvNode || movesPicked < 12) ? find_best_index() : movesPicked;
-
-          if (bestIndex != -1)
-          {
-              move = moves[bestIndex].move;
-              moves[bestIndex] = moves[movesPicked++];
-              if (   move != ttMove
-                  && move != mateKiller
-                  && pos.pl_move_is_legal(move, pinned))
-                  return move;
-          }
+          move = moves[bestIndex].move;
+          moves[bestIndex] = moves[movesPicked++];
+          if (   move != ttMove
+              && move != mateKiller
+              && pos.pl_move_is_legal(move))
+              return move;
       }
       break;
 
@@ -429,27 +423,23 @@ Move MovePicker::pick_move_from_list() {
       while (movesPicked < numOfMoves)
       {
           bestIndex = find_best_index();
-
-          if (bestIndex != -1)
-          {
-              move = moves[bestIndex].move;
-              moves[bestIndex] = moves[movesPicked++];
-              return move;
-          }
+          move = moves[bestIndex].move;
+          moves[bestIndex] = moves[movesPicked++];
+          return move;
     }
     break;
 
   case PH_BAD_CAPTURES:
       assert(!pos.is_check());
-      assert(badCapturesPicked >= 0);
+      assert(movesPicked >= 0);
       // It's probably a good idea to use SEE move ordering here, instead
       // of just picking the first move.  FIXME
-      while (badCapturesPicked < numOfBadCaptures)
+      while (movesPicked < numOfBadCaptures)
       {
-          move = badCaptures[badCapturesPicked++].move;
+          move = badCaptures[movesPicked++].move;
           if (   move != ttMove
               && move != mateKiller
-              && pos.pl_move_is_legal(move, pinned))
+              && pos.pl_move_is_legal(move))
               return move;
       }
       break;
@@ -460,16 +450,12 @@ Move MovePicker::pick_move_from_list() {
       while (movesPicked < numOfMoves)
       {
           bestIndex = (movesPicked < 4 ? find_best_index() : movesPicked);
-
-          if (bestIndex != -1)
-          {
-              move = moves[bestIndex].move;
-              moves[bestIndex] = moves[movesPicked++];
-              // Remember to change the line below if we decide to hash the qsearch!
-              // Maybe also postpone the legality check until after futility pruning?
-              if (/* move != ttMove && */ pos.pl_move_is_legal(move, pinned))
-                  return move;
-          }
+          move = moves[bestIndex].move;
+          moves[bestIndex] = moves[movesPicked++];
+          // Remember to change the line below if we decide to hash the qsearch!
+          // Maybe also postpone the legality check until after futility pruning?
+          if (/* move != ttMove && */ pos.pl_move_is_legal(move))
+              return move;
       }
       break;
 
@@ -482,7 +468,7 @@ Move MovePicker::pick_move_from_list() {
       {
           move = moves[movesPicked++].move;
           // Remember to change the line below if we decide to hash the qsearch!
-          if (/* move != ttMove && */ pos.pl_move_is_legal(move, pinned))
+          if (/* move != ttMove && */ pos.pl_move_is_legal(move))
               return move;
       }
       break;