HCha/Stockfish
1
0
Fork 0
mirror of https://github.com/HChaZZY/Stockfish.git synced 2025-12-20 00:56:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename Refutation to Countermove

Browse Source 
Use proper naming according to:

http://chessprogramming.wikispaces.com/Countermove+Heuristic

The name of this idea is "Countermove Heuristic" and was
first introduced by Jos Uiterwijk in 1992

No functional change.
This commit is contained in:
Marco Costalba
2013-05-15 20:35:54 +02:00
parent 7c6f346c90
commit 148490f04c
3 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/search.cpp
View File

@@ -86,9 +86,9 @@ namespace {
TimeManager TimeMgr;
int BestMoveChanges;
Value DrawValue[COLOR_NB];
History Hist;
Gains Gain;
Refutations Refutation;
HistoryStats History;
GainsStats Gains;
CountermovesStats Countermoves;
template <NodeType NT>
Value search(Position& pos, Stack* ss, Value alpha, Value beta, Depth depth);
@@ -304,9 +304,9 @@ namespace {
bestValue = delta = -VALUE_INFINITE;
ss->currentMove = MOVE_NULL; // Hack to skip update gains
TT.new_search();
Hist.clear();
Gain.clear();
Refutation.clear();
History.clear();
Gains.clear();
Countermoves.clear();
PVSize = Options["MultiPV"];
Skill skill(Options["Skill Level"]);
@@ -623,7 +623,7 @@ namespace {
&& type_of(move) == NORMAL)
{
Square to = to_sq(move);
Gain.update(pos.piece_on(to), to, -(ss-1)->staticEval - ss->staticEval);
Gains.update(pos.piece_on(to), to, -(ss-1)->staticEval - ss->staticEval);
}
// Step 6. Razoring (is omitted in PV nodes)
@@ -734,7 +734,7 @@ namespace {
assert((ss-1)->currentMove != MOVE_NONE);
assert((ss-1)->currentMove != MOVE_NULL);
MovePicker mp(pos, ttMove, Hist, pos.captured_piece_type());
MovePicker mp(pos, ttMove, History, pos.captured_piece_type());
CheckInfo ci(pos);
while ((move = mp.next_move<false>()) != MOVE_NONE)
@@ -766,7 +766,7 @@ namespace {
split_point_start: // At split points actual search starts from here
MovePicker mp(pos, ttMove, depth, Hist, Refutation, ss, PvNode ? -VALUE_INFINITE : beta);
MovePicker mp(pos, ttMove, depth, History, Countermoves, ss, PvNode ? -VALUE_INFINITE : beta);
CheckInfo ci(pos);
value = bestValue; // Workaround a bogus 'uninitialized' warning under gcc
singularExtensionNode = !RootNode
@@ -884,7 +884,7 @@ split_point_start: // At split points actual search starts from here
// but fixing this made program slightly weaker.
Depth predictedDepth = newDepth - reduction<PvNode>(depth, moveCount);
futilityValue = ss->staticEval + ss->evalMargin + futility_margin(predictedDepth, moveCount)
+ Gain[pos.piece_moved(move)][to_sq(move)];
+ Gains[pos.piece_moved(move)][to_sq(move)];
if (futilityValue < beta)
{
@@ -1091,18 +1091,18 @@ split_point_start: // At split points actual search starts from here
// Increase history value of the cut-off move
Value bonus = Value(int(depth) * int(depth));
Hist.update(pos.piece_moved(bestMove), to_sq(bestMove), bonus);
History.update(pos.piece_moved(bestMove), to_sq(bestMove), bonus);
if (is_ok((ss-1)->currentMove))
{
Square prevSq = to_sq((ss-1)->currentMove);
Refutation.update(pos.piece_on(prevSq), prevSq, bestMove);
Countermoves.update(pos.piece_on(prevSq), prevSq, bestMove);
}
// Decrease history of all the other played non-capture moves
for (int i = 0; i < playedMoveCount - 1; i++)
{
Move m = movesSearched[i];
Hist.update(pos.piece_moved(m), to_sq(m), -bonus);
History.update(pos.piece_moved(m), to_sq(m), -bonus);
}
}
}
@@ -1215,7 +1215,7 @@ split_point_start: // At split points actual search starts from here
// to search the moves. Because the depth is <= 0 here, only captures,
// queen promotions and checks (only if depth >= DEPTH_QS_CHECKS) will
// be generated.
MovePicker mp(pos, ttMove, depth, Hist, to_sq((ss-1)->currentMove));
MovePicker mp(pos, ttMove, depth, History, to_sq((ss-1)->currentMove));
CheckInfo ci(pos);
// Loop through the moves until no moves remain or a beta cutoff occurs