X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.cpp;h=4e31037c0af48d39f9319a36d8fc2a857b358ef4;hp=e0bd2a674025d0795955310c60758127509b4867;hb=f12449d492f75a83f9cd3a24cdb461bc3595536f;hpb=333696318555004770f6d2acaae0eb743cc7e9de

diff --git a/src/movepick.cpp b/src/movepick.cpp
index e0bd2a67..4e31037c 100644
--- 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,
-    MULTICUT,    CAPTURES_S5,
+    PROBCUT,     CAPTURES_S5,
     RECAPTURE,   CAPTURES_S6,
     STOP
   };
@@ -49,9 +49,9 @@ namespace {
     }
   }
 
-  // Unary predicate used by std::partition to split positive scores from remaining
+  // Unary predicate used by std::partition to split positive values from remaining
   // ones so as to sort the two sets separately, with the second sort delayed.
-  inline bool has_positive_score(const ExtMove& ms) { return ms.score > 0; }
+  inline bool has_positive_value(const ExtMove& ms) { return ms.value > 0; }
 
   // Picks the best move in the range (begin, end) and moves it to the front.
   // It's faster than sorting all the moves in advance when there are few
@@ -128,9 +128,9 @@ MovePicker::MovePicker(const Position& p, Move ttm, const HistoryStats& h, Piece
 
   assert(!pos.checkers());
 
-  stage = MULTICUT;
+  stage = PROBCUT;
 
-  // In MultiCut we generate only captures that are better than the parent's
+  // In ProbCut 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);
@@ -142,8 +142,8 @@ MovePicker::MovePicker(const Position& p, Move ttm, const HistoryStats& h, Piece
 }
 
 
-/// score() assign a numerical move ordering score to each move in a move list.
-/// The moves with highest scores will be picked first.
+/// score() assign a numerical value to each move in a move list. The moves with
+/// highest values will be picked first.
 template<>
 void MovePicker::score<CAPTURES>() {
   // Winning and equal captures in the main search are ordered by MVV/LVA.
@@ -164,14 +164,14 @@ void MovePicker::score<CAPTURES>() {
   for (ExtMove* it = moves; it != end; ++it)
   {
       m = it->move;
-      it->score =  PieceValue[MG][pos.piece_on(to_sq(m))]
+      it->value =  PieceValue[MG][pos.piece_on(to_sq(m))]
                  - type_of(pos.moved_piece(m));
 
       if (type_of(m) == PROMOTION)
-          it->score += PieceValue[MG][promotion_type(m)] - PieceValue[MG][PAWN];
+          it->value += PieceValue[MG][promotion_type(m)] - PieceValue[MG][PAWN];
 
       else if (type_of(m) == ENPASSANT)
-          it->score += PieceValue[MG][PAWN];
+          it->value += PieceValue[MG][PAWN];
   }
 }
 
@@ -183,7 +183,7 @@ void MovePicker::score<QUIETS>() {
   for (ExtMove* it = moves; it != end; ++it)
   {
       m = it->move;
-      it->score = history[pos.moved_piece(m)][to_sq(m)];
+      it->value = history[pos.moved_piece(m)][to_sq(m)];
   }
 }
 
@@ -191,21 +191,21 @@ template<>
 void MovePicker::score<EVASIONS>() {
   // Try good captures ordered by MVV/LVA, then non-captures if destination square
   // is not under attack, ordered by history value, then bad-captures and quiet
-  // moves with a negative SEE. This last group is ordered by the SEE score.
+  // moves with a negative SEE. This last group is ordered by the SEE value.
   Move m;
-  int seeScore;
+  Value see;
 
   for (ExtMove* it = moves; it != end; ++it)
   {
       m = it->move;
-      if ((seeScore = pos.see_sign(m)) < 0)
-          it->score = seeScore - HistoryStats::Max; // At the bottom
+      if ((see = pos.see_sign(m)) < VALUE_ZERO)
+          it->value = see - HistoryStats::Max; // At the bottom
 
       else if (pos.capture(m))
-          it->score =  PieceValue[MG][pos.piece_on(to_sq(m))]
+          it->value =  PieceValue[MG][pos.piece_on(to_sq(m))]
                      - type_of(pos.moved_piece(m)) + HistoryStats::Max;
       else
-          it->score = history[pos.moved_piece(m)][to_sq(m)];
+          it->value = history[pos.moved_piece(m)][to_sq(m)];
   }
 }
 
@@ -254,7 +254,7 @@ void MovePicker::generate_next_stage() {
   case QUIETS_1_S1:
       endQuiets = end = generate<QUIETS>(pos, moves);
       score<QUIETS>();
-      end = std::partition(cur, end, has_positive_score);
+      end = std::partition(cur, end, has_positive_value);
       insertion_sort(cur, end);
       return;
 
@@ -281,7 +281,7 @@ void MovePicker::generate_next_stage() {
       end = generate<QUIET_CHECKS>(pos, moves);
       return;
 
-  case EVASION: case QSEARCH_0: case QSEARCH_1: case MULTICUT: case RECAPTURE:
+  case EVASION: case QSEARCH_0: case QSEARCH_1: case PROBCUT: case RECAPTURE:
       stage = STOP;
   case STOP:
       end = cur + 1; // Avoid another next_phase() call
@@ -295,7 +295,7 @@ void MovePicker::generate_next_stage() {
 
 /// next_move() is the most important method of the MovePicker class. It returns
 /// a new pseudo legal move every time it is called, until there are no more moves
-/// left. It picks the move with the biggest score from a list of generated moves
+/// left. It picks the move with the biggest value from a list of generated moves
 /// taking care not to return the ttMove if it has already been searched.
 template<>
 Move MovePicker::next_move<false>() {
@@ -309,7 +309,7 @@ Move MovePicker::next_move<false>() {
 
       switch (stage) {
 
-      case MAIN_SEARCH: case EVASION: case QSEARCH_0: case QSEARCH_1: case MULTICUT:
+      case MAIN_SEARCH: case EVASION: case QSEARCH_0: case QSEARCH_1: case PROBCUT:
           ++cur;
           return ttMove;
 
@@ -317,7 +317,7 @@ Move MovePicker::next_move<false>() {
           move = pick_best(cur++, end)->move;
           if (move != ttMove)
           {
-              if (pos.see_sign(move) >= 0)
+              if (pos.see_sign(move) >= VALUE_ZERO)
                   return move;
 
               // Losing capture, move it to the tail of the array