X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=6a7fd4ebce3e50bcc8d598b5d04702ad4fe7a455;hp=ca0d8681a1d0515f4fc8c87110ab34124138ecd5;hb=a9e55d43262d11a916bdfa68cd1de0174d884cd3;hpb=eba8925d810fe9c30db18038830d427c655cdd50

diff --git a/src/movepick.cpp b/src/movepick.cpp
index ca0d8681..6a7fd4eb 100644
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -72,7 +72,6 @@ MovePicker::MovePicker(const Position& p, bool pv, Move ttm,
   mateKiller = (ss.mateKiller == ttm)? MOVE_NONE : ss.mateKiller;
   killer1 = ss.killers[0];
   killer2 = ss.killers[1];
-  threatMove = ss.threatMove;
   depth = d;
   movesPicked = 0;
   numOfMoves = 0;
@@ -98,7 +97,7 @@ MovePicker::MovePicker(const Position& p, bool pv, Move ttm,
       phaseIndex = (noCaptures ? NoMovesPhaseIndex : QsearchWithoutChecksPhaseIndex);
 
   dc = p.discovered_check_candidates(us);
-  pinned = p.pinned_pieces(p.side_to_move());
+  pinned = p.pinned_pieces(us);
 
   finished = false;
 }
@@ -142,8 +141,8 @@ Move MovePicker::get_next_move() {
             assert(move_is_ok(mateKiller));
             if (move_is_legal(pos, mateKiller, pinned))
                 return mateKiller;
-       }
-       break;
+        }
+        break;
 
     case PH_GOOD_CAPTURES:
         numOfMoves = generate_captures(pos, moves);
@@ -152,7 +151,7 @@ Move MovePicker::get_next_move() {
         break;
 
     case PH_BAD_CAPTURES:
-        badCapturesPicked = 0;
+        movesPicked = 0;
         break;
 
     case PH_NONCAPTURES:
@@ -163,7 +162,7 @@ Move MovePicker::get_next_move() {
 
     case PH_EVASIONS:
         assert(pos.is_check());
-        numOfMoves = generate_evasions(pos, moves);
+        numOfMoves = generate_evasions(pos, moves, pinned);
         score_evasions();
         movesPicked = 0;
         break;
@@ -271,11 +270,6 @@ void MovePicker::score_noncaptures() {
       else
           hs = H.move_ordering_score(pos.piece_on(move_from(m)), m);
 
-      // If the null move was refuted by a capture then give a
-      // bonus if we move away the captured piece.
-      if (threatMove != MOVE_NONE && move_from(m) == move_to(threatMove))
-          hs *= 3;
-
       // Ensure history is always preferred to pst
       if (hs > 0)
           hs += 1000;
@@ -316,17 +310,19 @@ void MovePicker::score_qcaptures() {
 }
 
 
-/// find_best_index() loops across the moves and returns index of
-/// the highest scored one. There is also a second version that
-/// lowers the priority of moves that attack the same square,
-/// so that if the best move that attack a square fails the next
+/// find_best_index() loops across the moves and returns index of
+/// the highest scored one. There is also a second version that
+/// lowers the priority of moves that attack the same square,
+/// so that if the best move that attack a square fails the next
 /// move picked attacks a different square if any, not the same one.
 
 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;
@@ -335,41 +331,43 @@ int MovePicker::find_best_index() {
   return bestIndex;
 }
 
-int MovePicker::find_best_index(Bitboard* squares, int values[]) {
-
-  int hs;
-  Move m;
-  Square to;
-  int bestScore = -10000000, bestIndex = -1;
-
-  for (int i = movesPicked; i < numOfMoves; i++)
-  {
-      m = moves[i].move;
-      to = move_to(m);
-      
-      if (!bit_is_set(*squares, to))
-      {
-          // Init at first use
-          set_bit(squares, to);
-          values[to] = 0;
-      }
-
-      hs = moves[i].score - values[to];
-      if (hs > bestScore)
-      {
-          bestIndex = i;
-          bestScore = hs;
-      }
-  }
-
-  if (bestIndex != -1)
-  {
-      // Raise value of the picked square, so next attack
-      // to the same square will get low priority.
-      to = move_to(moves[bestIndex].move);
-      values[to] += 0xB00;
-  }
-  return bestIndex;
+int MovePicker::find_best_index(Bitboard* squares, int values[]) {
+
+  assert(movesPicked < numOfMoves);
+
+  int hs;
+  Move m;
+  Square to;
+  int bestScore = -10000000, bestIndex = -1;
+
+  for (int i = movesPicked; i < numOfMoves; i++)
+  {
+      m = moves[i].move;
+      to = move_to(m);
+
+      if (!bit_is_set(*squares, to))
+      {
+          // Init at first use
+          set_bit(squares, to);
+          values[to] = 0;
+      }
+
+      hs = moves[i].score - values[to];
+      if (hs > bestScore)
+      {
+          bestIndex = i;
+          bestScore = hs;
+      }
+  }
+
+  if (bestIndex != -1)
+  {
+      // Raise value of the picked square, so next attack
+      // to the same square will get low priority.
+      to = move_to(moves[bestIndex].move);
+      values[to] += 0xB00;
+  }
+  return bestIndex;
 }
 
 
@@ -384,6 +382,7 @@ Move MovePicker::pick_move_from_list() {
   Move move;
 
   switch (PhaseTable[phaseIndex]) {
+
   case PH_GOOD_CAPTURES:
       assert(!pos.is_check());
       assert(movesPicked >= 0);
@@ -391,16 +390,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, pinned))
+              return move;
       }
       break;
 
@@ -415,16 +410,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, pinned))
+              return move;
       }
       break;
 
@@ -435,24 +426,20 @@ 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))
@@ -466,16 +453,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, pinned))
+              return move;
       }
       break;