WebSVN – Games.Chess Giants – Diff – //engine-stockfish/movepick.cpp

 #include "thread.h"
 namespace {
   enum Stages {
-    MAIN_SEARCH, GOOD_CAPTURES, KILLERS, GOOD_QUIETS, BAD_QUIETS, BAD_CAPTURES,
+    MAIN_SEARCH, CAPTURES_INIT, GOOD_CAPTURES, KILLERS, COUNTERMOVE, QUIET_INIT, QUIET, BAD_CAPTURES,
-    EVASION, ALL_EVASIONS,
+    EVASION, EVASIONS_INIT, ALL_EVASIONS,
-    QSEARCH_WITH_CHECKS, QCAPTURES_1, CHECKS,
+    PROBCUT, PROBCUT_INIT, PROBCUT_CAPTURES,
-    QSEARCH_WITHOUT_CHECKS, QCAPTURES_2,
+    QSEARCH_WITH_CHECKS, QCAPTURES_1_INIT, QCAPTURES_1, QCHECKS,
-    PROBCUT, PROBCUT_CAPTURES,
+    QSEARCH_NO_CHECKS, QCAPTURES_2_INIT, QCAPTURES_2,
-    RECAPTURE, RECAPTURES,
+    QSEARCH_RECAPTURES, QRECAPTURES
-    STOP
   };
   // Our insertion sort, which is guaranteed to be stable, as it should be
   void insertion_sort(ExtMove* begin, ExtMove* end)
+  {
 /// to help it to return the (presumably) good moves first, to decide which
 /// moves to return (in the quiescence search, for instance, we only want to
 /// search captures, promotions, and some checks) and how important good move
 /// ordering is at the current node.
-MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& h,
+MovePicker::MovePicker(const Position& p, Move ttm, Depth d, Search::Stack* s)
-                       const CounterMoveStats& cmh, Move cm, Search::Stack* s)
-           : pos(p), history(h), counterMoveHistory(&cmh), ss(s), countermove(cm), depth(d) {
+           : pos(p), ss(s), depth(d) {
   assert(d > DEPTH_ZERO);
+  Square prevSq = to_sq((ss-1)->currentMove);
+  countermove = pos.this_thread()->counterMoves[pos.piece_on(prevSq)][prevSq];
   stage = pos.checkers() ? EVASION : MAIN_SEARCH;
   ttMove = ttm && pos.pseudo_legal(ttm) ? ttm : MOVE_NONE;
-  endMoves += (ttMove != MOVE_NONE);
+  stage += (ttMove == MOVE_NONE);
+}
-MovePicker::MovePicker(const Position& p, Move ttm, Depth d,
+MovePicker::MovePicker(const Position& p, Move ttm, Depth d, Square s)
-                       const HistoryStats& h, Square s)
-           : pos(p), history(h), counterMoveHistory(nullptr) {
+           : pos(p) {
   assert(d <= DEPTH_ZERO);
   if (pos.checkers())
       stage = EVASION;
   else if (d > DEPTH_QS_NO_CHECKS)
       stage = QSEARCH_WITH_CHECKS;
   else if (d > DEPTH_QS_RECAPTURES)
-      stage = QSEARCH_WITHOUT_CHECKS;
+      stage = QSEARCH_NO_CHECKS;
   else
+  {
-      stage = RECAPTURE;
+      stage = QSEARCH_RECAPTURES;
       recaptureSquare = s;
-      ttm = MOVE_NONE;
+      return;
+  }
   ttMove = ttm && pos.pseudo_legal(ttm) ? ttm : MOVE_NONE;
-  endMoves += (ttMove != MOVE_NONE);
+  stage += (ttMove == MOVE_NONE);
+}
-MovePicker::MovePicker(const Position& p, Move ttm, const HistoryStats& h, Value th)
+MovePicker::MovePicker(const Position& p, Move ttm, Value th)
-           : pos(p), history(h), counterMoveHistory(nullptr), threshold(th) {
+           : pos(p), threshold(th) {
   assert(!pos.checkers());
   stage = PROBCUT;
   // In ProbCut we generate captures with SEE higher than the given threshold
   ttMove =   ttm
           && pos.pseudo_legal(ttm)
           && pos.capture(ttm)
-          && pos.see(ttm) > threshold ? ttm : MOVE_NONE;
+          && pos.see_ge(ttm, threshold + 1)? ttm : MOVE_NONE;
-  endMoves += (ttMove != MOVE_NONE);
+  stage += (ttMove == MOVE_NONE);
+}
 /// score() assigns a numerical value to each move in a move list. The moves with
 /// highest values will be picked first.
                - Value(200 * relative_rank(pos.side_to_move(), to_sq(m)));
+}
 template<>
 void MovePicker::score<QUIETS>() {
+  const HistoryStats& history = pos.this_thread()->history;
+  const FromToStats& fromTo = pos.this_thread()->fromTo;
+  const CounterMoveStats* cm = (ss-1)->counterMoves;
+  const CounterMoveStats* fm = (ss-2)->counterMoves;
+  const CounterMoveStats* f2 = (ss-4)->counterMoves;
+  Color c = pos.side_to_move();
   for (auto& m : *this)
-      m.value =  history[pos.moved_piece(m)][to_sq(m)]
+      m.value =      history[pos.moved_piece(m)][to_sq(m)]
-               + (*counterMoveHistory)[pos.moved_piece(m)][to_sq(m)];
+               + (cm ? (*cm)[pos.moved_piece(m)][to_sq(m)] : VALUE_ZERO)
+               + (fm ? (*fm)[pos.moved_piece(m)][to_sq(m)] : VALUE_ZERO)
+               + (f2 ? (*f2)[pos.moved_piece(m)][to_sq(m)] : VALUE_ZERO)
+               + fromTo.get(c, m);
+}
 template<>
 void MovePicker::score<EVASIONS>() {
-  // Try winning and equal captures ordered by MVV/LVA, then non-captures ordered
+  // Try captures ordered by MVV/LVA, then non-captures ordered by history value
-  // by history value, then bad captures and quiet moves with a negative SEE ordered
+  const HistoryStats& history = pos.this_thread()->history;
-  // by SEE value.
+  const FromToStats& fromTo = pos.this_thread()->fromTo;
-  Value see;
+  Color c = pos.side_to_move();
   for (auto& m : *this)
-      if ((see = pos.see_sign(m)) < VALUE_ZERO)
-          m.value = see - HistoryStats::Max; // At the bottom
-      else if (pos.capture(m))
+      if (pos.capture(m))
           m.value =  PieceValue[MG][pos.piece_on(to_sq(m))]
                    - Value(type_of(pos.moved_piece(m))) + HistoryStats::Max;
       else
-          m.value = history[pos.moved_piece(m)][to_sq(m)];
+          m.value = history[pos.moved_piece(m)][to_sq(m)] + fromTo.get(c, m);
-}
-/// 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_stage() {
-  assert(stage != STOP);
-  cur = moves;
-  switch (++stage) {
-  case GOOD_CAPTURES: case QCAPTURES_1: case QCAPTURES_2:
-  case PROBCUT_CAPTURES: case RECAPTURES:
-      endMoves = generate<CAPTURES>(pos, moves);
-      score<CAPTURES>();
-      break;
-  case KILLERS:
-      killers[0] = ss->killers[0];
-      killers[1] = ss->killers[1];
-      killers[2] = countermove;
-      cur = killers;
-      endMoves = cur + 2 + (countermove != killers[0] && countermove != killers[1]);
-      break;
-  case GOOD_QUIETS:
-      endQuiets = endMoves = generate<QUIETS>(pos, moves);
-      score<QUIETS>();
-      endMoves = std::partition(cur, endMoves, [](const ExtMove& m) { return m.value > VALUE_ZERO; });
-      insertion_sort(cur, endMoves);
-      break;
-  case BAD_QUIETS:
-      cur = endMoves;
-      endMoves = endQuiets;
-      if (depth >= 3 * ONE_PLY)
-          insertion_sort(cur, endMoves);
-      break;
-  case BAD_CAPTURES:
-      // Just pick them in reverse order to get correct ordering
-      cur = moves + MAX_MOVES - 1;
-      endMoves = endBadCaptures;
-      break;
-  case ALL_EVASIONS:
-      endMoves = generate<EVASIONS>(pos, moves);
-      if (endMoves - moves > 1)
-          score<EVASIONS>();
-      break;
-  case CHECKS:
-      endMoves = generate<QUIET_CHECKS>(pos, moves);
-      break;
-  case EVASION: case QSEARCH_WITH_CHECKS: case QSEARCH_WITHOUT_CHECKS:
-  case PROBCUT: case RECAPTURE: case STOP:
-      stage = STOP;
-      break;
-  default:
-      assert(false);
-  }
+}
 /// 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
 Move MovePicker::next_move() {
   Move move;
-  while (true)
+  switch (stage) {
-  {
-      while (cur == endMoves && stage != STOP)
-          generate_next_stage();
+  case MAIN_SEARCH: case EVASION: case QSEARCH_WITH_CHECKS:
+  case QSEARCH_NO_CHECKS: case PROBCUT:
-      switch (stage) {
+      ++stage;
+      return ttMove;
+  case CAPTURES_INIT:
-      case MAIN_SEARCH: case EVASION: case QSEARCH_WITH_CHECKS:
+      endBadCaptures = cur = moves;
-      case QSEARCH_WITHOUT_CHECKS: case PROBCUT:
+      endMoves = generate<CAPTURES>(pos, cur);
-          ++cur;
+      score<CAPTURES>();
-          return ttMove;
+      ++stage;
-      case GOOD_CAPTURES:
+  case GOOD_CAPTURES:
+      while (cur < endMoves)
+      {
           move = pick_best(cur++, endMoves);
           if (move != ttMove)
+          {
-              if (pos.see_sign(move) >= VALUE_ZERO)
+              if (pos.see_ge(move, VALUE_ZERO))
                   return move;
-              // Losing capture, move it to the tail of the array
+              // Losing capture, move it to the beginning of the array
-              *endBadCaptures-- = move;
+              *endBadCaptures++ = move;
+          }
-          break;
+      }
-      case KILLERS:
+      ++stage;
-          move = *cur++;
+      move = ss->killers[0];  // First killer move
-          if (    move != MOVE_NONE
+      if (    move != MOVE_NONE
-              &&  move != ttMove
+          &&  move != ttMove
-              &&  pos.pseudo_legal(move)
+          &&  pos.pseudo_legal(move)
-              && !pos.capture(move))
+          && !pos.capture(move))
-              return move;
+          return move;
-          break;
+  case KILLERS:
+      ++stage;
+      move = ss->killers[1]; // Second killer move
+      if (    move != MOVE_NONE
+          &&  move != ttMove
+          &&  pos.pseudo_legal(move)
+          && !pos.capture(move))
+          return move;
+  case COUNTERMOVE:
+      ++stage;
+      move = countermove;
+      if (    move != MOVE_NONE
+          &&  move != ttMove
+          &&  move != ss->killers[0]
+          &&  move != ss->killers[1]
+          &&  pos.pseudo_legal(move)
+          && !pos.capture(move))
+          return move;
+  case QUIET_INIT:
+      cur = endBadCaptures;
+      endMoves = generate<QUIETS>(pos, cur);
+      score<QUIETS>();
+      if (depth < 3 * ONE_PLY)
+      {
+          ExtMove* goodQuiet = std::partition(cur, endMoves, [](const ExtMove& m)
+                                             { return m.value > VALUE_ZERO; });
-      case GOOD_QUIETS: case BAD_QUIETS:
+          insertion_sort(cur, goodQuiet);
+      } else
+          insertion_sort(cur, endMoves);
+      ++stage;
+  case QUIET:
+      while (cur < endMoves)
+      {
           move = *cur++;
           if (   move != ttMove
-              && move != killers[0]
+              && move != ss->killers[0]
-              && move != killers[1]
+              && move != ss->killers[1]
-              && move != killers[2])
+              && move != countermove)
               return move;
+      }
-          break;
+      ++stage;
+      cur = moves; // Point to beginning of bad captures
-      case BAD_CAPTURES:
+  case BAD_CAPTURES:
+      if (cur < endBadCaptures)
-          return *cur--;
+          return *cur++;
+      break;
+  case EVASIONS_INIT:
+      cur = moves;
-      case ALL_EVASIONS: case QCAPTURES_1: case QCAPTURES_2:
+      endMoves = generate<EVASIONS>(pos, cur);
+      score<EVASIONS>();
+      ++stage;
+  case ALL_EVASIONS:
+      while (cur < endMoves)
+      {
           move = pick_best(cur++, endMoves);
           if (move != ttMove)
               return move;
+      }
-          break;
+      break;
-      case PROBCUT_CAPTURES:
+  case PROBCUT_INIT:
-           move = pick_best(cur++, endMoves);
+      cur = moves;
-           if (move != ttMove && pos.see(move) > threshold)
+      endMoves = generate<CAPTURES>(pos, cur);
-               return move;
+      score<CAPTURES>();
-           break;
+      ++stage;
-      case RECAPTURES:
+  case PROBCUT_CAPTURES:
+      while (cur < endMoves)
+      {
           move = pick_best(cur++, endMoves);
-          if (to_sq(move) == recaptureSquare)
+          if (   move != ttMove
+              && pos.see_ge(move, threshold + 1))
               return move;
+      }
-          break;
+      break;
+  case QCAPTURES_1_INIT: case QCAPTURES_2_INIT:
-      case CHECKS:
+      cur = moves;
+      endMoves = generate<CAPTURES>(pos, cur);
+      score<CAPTURES>();
+      ++stage;
+  case QCAPTURES_1: case QCAPTURES_2:
+      while (cur < endMoves)
+      {
-          move = *cur++;
+          move = pick_best(cur++, endMoves);
           if (move != ttMove)
               return move;
+      }
+      if (stage == QCAPTURES_2)
           break;
+      cur = moves;
+      endMoves = generate<QUIET_CHECKS>(pos, cur);
+      ++stage;
-      case STOP:
+  case QCHECKS:
+      while (cur < endMoves)
+      {
+          move = cur++->move;
+          if (move != ttMove)
-          return MOVE_NONE;
+              return move;
+      }
+      break;
+  case QSEARCH_RECAPTURES:
+      cur = moves;
+      endMoves = generate<CAPTURES>(pos, cur);
+      score<CAPTURES>();
-      default:
+      ++stage;
+  case QRECAPTURES:
+      while (cur < endMoves)
+      {
+          move = pick_best(cur++, endMoves);
+          if (to_sq(move) == recaptureSquare)
-          assert(false);
+              return move;
+      }
+      break;
+  default:
+      assert(false);
+  }
+  return MOVE_NONE;
+}

Subversion Repositories Games.Chess Giants

Games.Chess Giants//engine-stockfish/movepick.cpp – Rev 96 → 154