Teach MovePicker::get_next_move() to return move type

[stockfish] / src / movepick.cpp

diff --git a/src/movepick.cpp b/src/movepick.cpp
index 6df070bbdf167b8e835a1970eb5099f846dbcfd7..fa911dfb350b348e2399a964d6262b9dcf7b443d 100644 (file)
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -36,26 +36,9 @@
 
 namespace {
 
-  /// Types
-
-  enum MovegenPhase {
-    PH_TT_MOVE,        // Transposition table move
-    PH_MATE_KILLER,    // Mate killer from the current ply
-    PH_GOOD_CAPTURES,  // Queen promotions and captures with SEE values >= 0
-    PH_BAD_CAPTURES,   // Queen promotions and captures with SEE valuse <= 0
-    PH_KILLER_1,       // Killer move 1 from the current ply (not used yet).
-    PH_KILLER_2,       // Killer move 2 from the current ply (not used yet).
-    PH_NONCAPTURES,    // Non-captures and underpromotions
-    PH_EVASIONS,       // Check evasions
-    PH_QCAPTURES,      // Captures in quiescence search
-    PH_QCHECKS,        // Checks in quiescence search
-    PH_STOP
-  };
-
-
   /// Variables
 
-  MovegenPhase PhaseTable[32];
+  MovePicker::MovegenPhase PhaseTable[32];
   int MainSearchPhaseIndex;
   int EvasionsPhaseIndex;
   int QsearchWithChecksPhaseIndex;
@@ -109,7 +92,7 @@ MovePicker::MovePicker(Position &p, bool pvnode, Move ttm, Move mk,
 /// class.  It returns a new legal move every time it is called, until there
 /// are no more moves left of the types we are interested in.
 
-Move MovePicker::get_next_move() {
+Move MovePicker::get_next_move(MovegenPhase* moveType) {
   Move move;
 
   while(true) {
@@ -123,6 +106,9 @@ Move MovePicker::get_next_move() {
 
     // Next phase:
     phaseIndex++;
+    if (moveType)
+        *moveType = PhaseTable[phaseIndex];
+
     switch(PhaseTable[phaseIndex]) {
 
     case PH_TT_MOVE:
@@ -335,10 +321,8 @@ Move MovePicker::pick_move_from_list() {
         }
       }
       if(bestIndex != -1) { // Found a good capture
-        MoveStack tmp = moves[movesPicked];
-        moves[movesPicked] = moves[bestIndex];
-        moves[bestIndex] = tmp;
-        move = moves[movesPicked++].move;
+        move = moves[bestIndex].move;\r
+        moves[bestIndex] = moves[movesPicked++];
         if(move != ttMove && move != mateKiller &&
            pos->move_is_legal(move, pinned))
           return move;
@@ -368,10 +352,8 @@ Move MovePicker::pick_move_from_list() {
         bestIndex = movesPicked;
 
       if(bestIndex != -1) {
-        MoveStack tmp = moves[movesPicked];
-        moves[movesPicked] = moves[bestIndex];
-        moves[bestIndex] = tmp;
-        move = moves[movesPicked++].move;
+        move = moves[bestIndex].move;\r
+        moves[bestIndex] = moves[movesPicked++];
         if(move != ttMove && move != mateKiller &&
            pos->move_is_legal(move, pinned))
           return move;
@@ -392,10 +374,8 @@ Move MovePicker::pick_move_from_list() {
         }
 
       if(bestIndex != -1) {
-        MoveStack tmp = moves[movesPicked];
-        moves[movesPicked] = moves[bestIndex];
-        moves[bestIndex] = tmp;
-        move = moves[movesPicked++].move;
+        move = moves[bestIndex].move;\r
+        moves[bestIndex] = moves[movesPicked++];
         return move;
       }
     }
@@ -431,11 +411,8 @@ Move MovePicker::pick_move_from_list() {
         bestIndex = movesPicked;
 
       if(bestIndex != -1) {
-        MoveStack tmp = moves[movesPicked];
-        moves[movesPicked] = moves[bestIndex];
-        moves[bestIndex] = tmp;
-
-        move = moves[movesPicked++].move;
+        move = moves[bestIndex].move;\r
+        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->move_is_legal(move, pinned))