X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=ee747c94525cdee18b9f78ea585abd3854cd23e8;hp=34c69895562136317dc1ecb7d13917a42f262c60;hb=8a0dd93c56f63de467190145116ed6c5cfd54bc1;hpb=7000e100bd35949b80e9f52cd175c652d5211a0a

diff --git a/src/movepick.cpp b/src/movepick.cpp
index 34c69895..ee747c94 100644
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -26,6 +26,7 @@
 #include <cassert>
 
 #include "history.h"
+#include "evaluate.h"
 #include "movegen.h"
 #include "movepick.h"
 #include "search.h"
@@ -44,7 +45,9 @@ namespace {
   int MainSearchPhaseIndex;
   int EvasionsPhaseIndex;
   int QsearchWithChecksPhaseIndex;
+  int QsearchNoCapturesPhaseIndex;
   int QsearchWithoutChecksPhaseIndex;
+  int NoMovesPhaseIndex;
 
 }
 
@@ -62,28 +65,38 @@ namespace {
 /// search captures, promotions and some checks) and about how important good
 /// move ordering is at the current node.
 
-MovePicker::MovePicker(const Position& p, bool pvnode, Move ttm, Move mk,
-                       Move k1, Move k2, Depth d) : pos(p) {
-  pvNode = pvnode;
+MovePicker::MovePicker(const Position& p, bool pv, Move ttm,
+                       const SearchStack& ss, Depth d, EvalInfo* ei) : pos(p) {
+  pvNode = pv;
   ttMove = ttm;
-  mateKiller = (mk == ttm)? MOVE_NONE : mk;
-  killer1 = k1;
-  killer2 = k2;
+  mateKiller = (ss.mateKiller == ttm)? MOVE_NONE : ss.mateKiller;
+  killer1 = ss.killers[0];
+  killer2 = ss.killers[1];
   depth = d;
   movesPicked = 0;
   numOfMoves = 0;
   numOfBadCaptures = 0;
-  dc = p.discovered_check_candidates(p.side_to_move());
+
+  // With EvalInfo we are able to know how many captures are possible before
+  // generating them. So avoid generating in case we know are zero.
+  Color us = pos.side_to_move();
+  Color them = opposite_color(us);
+  bool noCaptures =    ei
+                   && (ei->attackedBy[us][0] & pos.pieces_of_color(them)) == 0
+                   && !ei->mi->specialized_eval_exists()
+                   && (pos.ep_square() == SQ_NONE)
+                   && !pos.has_pawn_on_7th(us);
 
   if (p.is_check())
-    phaseIndex = EvasionsPhaseIndex;
+      phaseIndex = EvasionsPhaseIndex;
   else if (depth > Depth(0))
-    phaseIndex = MainSearchPhaseIndex;
+      phaseIndex = MainSearchPhaseIndex;
   else if (depth == Depth(0))
-    phaseIndex = QsearchWithChecksPhaseIndex;
+      phaseIndex = (noCaptures ? QsearchNoCapturesPhaseIndex : QsearchWithChecksPhaseIndex);
   else
-    phaseIndex = QsearchWithoutChecksPhaseIndex;
+      phaseIndex = (noCaptures ? NoMovesPhaseIndex : QsearchWithoutChecksPhaseIndex);
 
+  dc = p.discovered_check_candidates(us);
   pinned = p.pinned_pieces(p.side_to_move());
 
   finished = false;
@@ -134,7 +147,6 @@ Move MovePicker::get_next_move() {
     case PH_GOOD_CAPTURES:
         numOfMoves = generate_captures(pos, moves);
         score_captures();
-        capSquares = EmptyBoardBB;
         movesPicked = 0;
         break;
 
@@ -280,7 +292,6 @@ void MovePicker::score_evasions() {
       } else
           moves[i].score = H.move_ordering_score(pos.piece_on(move_from(m)), m);
   }
-  // FIXME try psqt also here
 }
 
 void MovePicker::score_qcaptures() {
@@ -372,7 +383,7 @@ Move MovePicker::pick_move_from_list() {
 
       while (movesPicked < numOfMoves)
       {
-          bestIndex = find_best_index(&capSquares, capSqValues);
+          bestIndex = find_best_index();
 
           if (bestIndex != -1) // Found a good capture
           {
@@ -493,8 +504,9 @@ MovePicker::MovegenPhase MovePicker::current_move_type() const {
 
 /// MovePicker::init_phase_table() initializes the PhaseTable[],
 /// MainSearchPhaseIndex, EvasionPhaseIndex, QsearchWithChecksPhaseIndex
-/// and QsearchWithoutChecksPhaseIndex variables. It is only called once
-/// during program startup, and never again while the program is running.
+/// QsearchNoCapturesPhaseIndex, QsearchWithoutChecksPhaseIndex and
+/// NoMovesPhaseIndex variables. It is only called once during program
+/// startup, and never again while the program is running.
 
 void MovePicker::init_phase_table() {
 
@@ -523,8 +535,17 @@ void MovePicker::init_phase_table() {
   PhaseTable[i++] = PH_QCHECKS;
   PhaseTable[i++] = PH_STOP;
 
+  // Quiescence search with checks only and no captures
+  QsearchNoCapturesPhaseIndex = i - 1;
+  PhaseTable[i++] = PH_QCHECKS;
+  PhaseTable[i++] = PH_STOP;
+
   // Quiescence search without checks
   QsearchWithoutChecksPhaseIndex = i - 1;
   PhaseTable[i++] = PH_QCAPTURES;
   PhaseTable[i++] = PH_STOP;
+
+  // Do not generate any move
+  NoMovesPhaseIndex = i - 1;
+  PhaseTable[i++] = PH_STOP;
 }