Rename ProbCut to Multicut

[stockfish] / src / movepick.cpp

diff --git a/src/movepick.cpp b/src/movepick.cpp
index 41b85f074ae0994a86c6615707ad03bb5be925b2..e0bd2a674025d0795955310c60758127509b4867 100644 (file)
--- a/src/movepick.cpp
+++ b/src/movepick.cpp
@@ -30,7 +30,7 @@ namespace {
     EVASION,     EVASIONS_S2,
     QSEARCH_0,   CAPTURES_S3, QUIET_CHECKS_S3,
     QSEARCH_1,   CAPTURES_S4,
     EVASION,     EVASIONS_S2,
     QSEARCH_0,   CAPTURES_S3, QUIET_CHECKS_S3,
     QSEARCH_1,   CAPTURES_S4,

-    PROBCUT,     CAPTURES_S5,
+    MULTICUT,    CAPTURES_S5,

     RECAPTURE,   CAPTURES_S6,
     STOP
   };
     RECAPTURE,   CAPTURES_S6,
     STOP
   };


@@ -128,9 +128,9 @@ MovePicker::MovePicker(const Position& p, Move ttm, const HistoryStats& h, Piece
 
   assert(!pos.checkers());
 
 
   assert(!pos.checkers());
 

-  stage = PROBCUT;
+  stage = MULTICUT;

 
 

-  // In ProbCut we generate only captures that are better than the parent's
+  // In MultiCut we generate only captures that are better than the parent's

   // captured piece.
   captureThreshold = PieceValue[MG][pt];
   ttMove = (ttm && pos.pseudo_legal(ttm) ? ttm : MOVE_NONE);
   // captured piece.
   captureThreshold = PieceValue[MG][pt];
   ttMove = (ttm && pos.pseudo_legal(ttm) ? ttm : MOVE_NONE);


@@ -210,10 +210,10 @@ void MovePicker::score<EVASIONS>() {
 }
 
 
 }
 
 

-/// generate_next() generates, scores and sorts the next bunch of moves, when
-/// there are no more moves to try for the current phase.
+/// generate_next_stage() generates, scores and sorts the next bunch of moves,
+/// when there are no more moves to try for the current stage.

 
 

-void MovePicker::generate_next() {
+void MovePicker::generate_next_stage() {

 
   cur = moves;
 
 
   cur = moves;
 


@@ -281,7 +281,7 @@ void MovePicker::generate_next() {
       end = generate<QUIET_CHECKS>(pos, moves);
       return;
 
       end = generate<QUIET_CHECKS>(pos, moves);
       return;
 

-  case EVASION: case QSEARCH_0: case QSEARCH_1: case PROBCUT: case RECAPTURE:
+  case EVASION: case QSEARCH_0: case QSEARCH_1: case MULTICUT: case RECAPTURE:

       stage = STOP;
   case STOP:
       end = cur + 1; // Avoid another next_phase() call
       stage = STOP;
   case STOP:
       end = cur + 1; // Avoid another next_phase() call


@@ -305,11 +305,11 @@ Move MovePicker::next_move<false>() {
   while (true)
   {
       while (cur == end)
   while (true)
   {
       while (cur == end)

-          generate_next();
+          generate_next_stage();

 
       switch (stage) {
 
 
       switch (stage) {
 

-      case MAIN_SEARCH: case EVASION: case QSEARCH_0: case QSEARCH_1: case PROBCUT:
+      case MAIN_SEARCH: case EVASION: case QSEARCH_0: case QSEARCH_1: case MULTICUT:

           ++cur;
           return ttMove;
 
           ++cur;
           return ttMove;