Remove one indentation level in get_next_move()

Small renaming and fix some comments.

No functional and no speed change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>

src/movegen.h

@@ -20,6 +20,7 @@
 #if !defined(MOVEGEN_H_INCLUDED)
 #define MOVEGEN_H_INCLUDED
 
+#include "move.h"
 #include "position.h"
 
 enum MoveType {

src/movepick.cpp

@@ -20,7 +20,6 @@
 
 #include <cassert>
 
-#include "history.h"
 #include "movegen.h"
 #include "movepick.h"
 #include "search.h"
@@ -41,10 +40,10 @@ namespace {
   };
 
   CACHE_LINE_ALIGNMENT
-  const uint8_t MainSearchPhaseTable[] = { PH_TT_MOVES, PH_GOOD_CAPTURES, PH_KILLERS, PH_NONCAPTURES, PH_BAD_CAPTURES, PH_STOP};
+  const uint8_t MainSearchTable[] = { PH_TT_MOVES, PH_GOOD_CAPTURES, PH_KILLERS, PH_NONCAPTURES, PH_BAD_CAPTURES, PH_STOP };
-  const uint8_t EvasionsPhaseTable[] = { PH_TT_MOVES, PH_EVASIONS, PH_STOP};
+  const uint8_t EvasionTable[] = { PH_TT_MOVES, PH_EVASIONS, PH_STOP };
-  const uint8_t QsearchWithChecksPhaseTable[] = { PH_TT_MOVES, PH_QCAPTURES, PH_QCHECKS, PH_STOP};
+  const uint8_t QsearchWithChecksTable[] = { PH_TT_MOVES, PH_QCAPTURES, PH_QCHECKS, PH_STOP };
-  const uint8_t QsearchWithoutChecksPhaseTable[] = { PH_TT_MOVES, PH_QCAPTURES, PH_STOP};
+  const uint8_t QsearchWithoutChecksTable[] = { PH_TT_MOVES, PH_QCAPTURES, PH_STOP };
 }
 
 
@@ -69,7 +68,7 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h,
   if (p.is_check())
   {
       ttMoves[1].move = killers[0].move = killers[1].move = MOVE_NONE;
-      phasePtr = EvasionsPhaseTable;
+      phasePtr = EvasionTable;
   }
   else
   {
@@ -83,7 +82,7 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h,
       if (ss && ss->eval < beta - PawnValueMidgame && d < 3 * ONE_PLY)
           badCaptureThreshold = -PawnValueMidgame;
 
-      phasePtr = MainSearchPhaseTable;
+      phasePtr = MainSearchTable;
   }
 
   phasePtr += int(!searchTT) - 1;
@@ -101,12 +100,12 @@ MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const History& h)
   pinned = p.pinned_pieces(pos.side_to_move());
 
   if (p.is_check())
-      phasePtr = EvasionsPhaseTable;
+      phasePtr = EvasionTable;
   else if (d >= DEPTH_QS_CHECKS)
-      phasePtr = QsearchWithChecksPhaseTable;
+      phasePtr = QsearchWithChecksTable;
   else
   {
-      phasePtr = QsearchWithoutChecksPhaseTable;
+      phasePtr = QsearchWithoutChecksTable;
 
       // Skip TT move if is not a capture or a promotion, this avoids
       // qsearch tree explosion due to a possible perpetual check or
@@ -173,7 +172,7 @@ void MovePicker::go_next_phase() {
       return;
 
   case PH_STOP:
-      lastMove = curMove + 1; // Avoids another go_next_phase() call
+      lastMove = curMove + 1; // Avoid another go_next_phase() call
       return;
 
   default:
@@ -259,11 +258,10 @@ void MovePicker::score_evasions() {
 
 /// MovePicker::get_next_move() is the most important method of the MovePicker
 /// class. It returns a new legal move every time it is called, until there
-/// are no more moves left.
+/// are no more moves left. It picks the move with the biggest score from a list
-/// It picks the move with the biggest score from a list of generated moves taking
+/// of generated moves taking care not to return the tt move if has already been
-/// care not to return the tt move if has already been searched previously.
+/// searched previously. Note that this function is not thread safe so should be
-/// Note that this function is not thread safe so should be lock protected by
+/// lock protected by caller when accessed through a shared MovePicker object.
-/// caller when accessed through a shared MovePicker object.
 
 Move MovePicker::get_next_move() {
 
@@ -271,8 +269,9 @@ Move MovePicker::get_next_move() {
 
   while (true)
   {
-      while (curMove != lastMove)
+      while (curMove == lastMove)
-      {
+          go_next_phase();
+
       switch (phase) {
 
       case PH_TT_MOVES:
@@ -311,7 +310,6 @@ Move MovePicker::get_next_move() {
           break;
 
       case PH_NONCAPTURES:
-
           // Sort negative scored moves only when we get there
           if (curMove == lastGoodNonCapture)
               insertion_sort<MoveStack>(lastGoodNonCapture, lastMove);
@@ -352,6 +350,4 @@ Move MovePicker::get_next_move() {
           break;
       }
   }
-      go_next_phase();
-  }
 }

src/movepick.h

@@ -21,6 +21,7 @@
 #define MOVEPICK_H_INCLUDED
 
 #include "history.h"
+#include "move.h"
 #include "position.h"
 #include "types.h"
 
@@ -29,18 +30,18 @@ struct SearchStack;
 /// MovePicker is a class which is used to pick one legal move at a time from
 /// the current position. It is initialized with a Position object and a few
 /// moves we have reason to believe are good. The most important method is
-/// MovePicker::pick_next_move(), which returns a new legal move each time it
+/// MovePicker::get_next_move(), which returns a new legal move each time it
 /// is called, until there are no legal moves left, when MOVE_NONE is returned.
 /// In order to improve the efficiency of the alpha beta algorithm, MovePicker
-/// attempts to return the moves which are most likely to be strongest first.
+/// attempts to return the moves which are most likely to get a cut-off first.
 
 class MovePicker {
 
-  MovePicker& operator=(const MovePicker&); // silence a warning under MSVC
+  MovePicker& operator=(const MovePicker&); // Silence a warning under MSVC
 
 public:
-  MovePicker(const Position& p, Move ttm, Depth d, const History& h, SearchStack* ss, Value beta);
+  MovePicker(const Position&, Move, Depth, const History&, SearchStack*, Value);
-  MovePicker(const Position& p, Move ttm, Depth d, const History& h);
+  MovePicker(const Position&, Move, Depth, const History&);
   Move get_next_move();
 
 private: