Generate pseudo-legal moves in generate_evasions()

[stockfish] / src / movepick.cpp

diff --git a/src/movepick.cpp b/src/movepick.cpp
index 0da6b61bbbbe99f176eea9a5c67f75db9cd8b306..a2ea3a7354f951dcb9edce6007118874db36e832 100644 (file)
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -197,8 +197,8 @@ void MovePicker::score_captures() {
       if (move_is_promotion(m))
           cur->score = QueenValueMidgame;
       else
-          cur->score = int(pos.midgame_value_of_piece_on(move_to(m)))
-                      -int(pos.type_of_piece_on(move_from(m)));
+          cur->score =  pos.midgame_value_of_piece_on(move_to(m))
+                      - pos.type_of_piece_on(move_from(m));
   }
 }
 
@@ -229,19 +229,25 @@ void MovePicker::score_noncaptures() {
 }
 
 void MovePicker::score_evasions() {
-
+  // Always try ttMove as first. Then try good captures ordered
+  // by MVV/LVA, then non-captures if destination square is not
+  // under attack, ordered by history value, and at the end
+  // bad-captures and non-captures with a negative SEE. This
+  // last group is ordered by the SEE score.
   Move m;
+  int seeScore;
 
   for (MoveStack* cur = moves; cur != lastMove; cur++)
   {
       m = cur->move;
       if (m == ttMoves[0].move)
           cur->score = 2 * HistoryMax;
-      else if (!pos.square_is_empty(move_to(m)))
-      {
-          int seeScore = pos.see(m);
-          cur->score = seeScore + (seeScore >= 0 ? HistoryMax : 0);
-      } else
+      else if ((seeScore = pos.see_sign(m)) < 0)
+          cur->score = seeScore;
+      else if (pos.move_is_capture(m))
+          cur->score =  pos.midgame_value_of_piece_on(move_to(m))
+                      - pos.type_of_piece_on(move_from(m)) + HistoryMax;
+      else
           cur->score = H.move_ordering_score(pos.piece_on(move_from(m)), move_to(m));
   }
 }
@@ -312,11 +318,16 @@ Move MovePicker::get_next_move() {
                   return move;
               break;
 
-          case PH_EVASIONS:
           case PH_BAD_CAPTURES:
               move = pick_best(curMove++, lastMove).move;
               return move;
 
+          case PH_EVASIONS:
+              move = pick_best(curMove++, lastMove).move;
+              if (pos.pl_move_is_legal(move, pinned))
+                  return move;
+              break;
+
           case PH_QCAPTURES:
               move = pick_best(curMove++, lastMove).move;
               if (   move != ttMoves[0].move