Teach MovePicker::get_next_move() to return move type

This will be used in future patches.

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

diff --git a/src/movepick.cpp b/src/movepick.cpp
index 235191af96bdad297144123f662dd1f503aba2f5..fa911dfb350b348e2399a964d6262b9dcf7b443d 100644 (file)
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -36,26 +36,9 @@
 
 namespace {
 
 
 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
 
   /// Variables
 

-  MovegenPhase PhaseTable[32];
+  MovePicker::MovegenPhase PhaseTable[32];

   int MainSearchPhaseIndex;
   int EvasionsPhaseIndex;
   int QsearchWithChecksPhaseIndex;
   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.
 
 /// 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) {
   Move move;
 
   while(true) {


@@ -123,6 +106,9 @@ Move MovePicker::get_next_move() {
 
     // Next phase:
     phaseIndex++;
 
     // Next phase:
     phaseIndex++;

+    if (moveType)
+        *moveType = PhaseTable[phaseIndex];
+

     switch(PhaseTable[phaseIndex]) {
 
     case PH_TT_MOVE:
     switch(PhaseTable[phaseIndex]) {
 
     case PH_TT_MOVE:

diff --git a/src/movepick.h b/src/movepick.h
index ca052c7bd1901c250f35d0fea3aaf0c5fc422a05..17f29daa93e353c83d955304e14388f43237eb64 100644 (file)
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -44,9 +44,24 @@
 class MovePicker {
 
 public:
 class MovePicker {
 
 public:

+
+  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
+  };
+

   MovePicker(Position &p, bool pvnode, Move ttm, Move mk, Move k1, Move k2,
              Depth dpth);
   MovePicker(Position &p, bool pvnode, Move ttm, Move mk, Move k1, Move k2,
              Depth dpth);

-  Move get_next_move();
+  Move get_next_move(MovegenPhase* moveType = NULL);

   Move get_next_move(Lock &lock);
   int number_of_moves() const;
   int current_move_score() const;
   Move get_next_move(Lock &lock);
   int number_of_moves() const;
   int current_move_score() const;