Skip to content

Commit

Permalink
Restore PorbCut name
Browse files Browse the repository at this point in the history
Actually MultiCut is too different from current scheme.
Note that neither ProbCut is exactly what we do because
we try just a handful of captures instead of all moves,
nevertheless it seems more in line with what we do.

Suggested by Joona.

No functional change.
  • Loading branch information
mcostalba committed Feb 15, 2014
1 parent 7bdb8c9 commit 62c0dc5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions src/movepick.cpp
Expand Up @@ -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
};
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/search.cpp
Expand Up @@ -659,7 +659,7 @@ namespace {
}
}

// Step 9. Multi-Cut (skipped when in check)
// Step 9. ProbCut (skipped when in check)
// If we have a very good capture (i.e. SEE > seeValues[captured_piece_type])
// and a reduced search returns a value much above beta, we can (almost) safely
// prune the previous move.
Expand Down

0 comments on commit 62c0dc5

Please sign in to comment.