Skip to content

Commit

Permalink
Remove HistoryStats
Browse files Browse the repository at this point in the history 
STC:
LLR: 3.44 (-2.94,2.94) [-3.00,1.00]
Total: 120831 W: 21572 L: 21594 D: 77665

LTC:
LLR: 2.96 (-2.94,2.94) [-3.00,1.00]
Total: 26565 W: 3519 L: 3406 D: 19640

bench 5920493
  • Loading branch information
@lucasart @mcostalba
lucasart authored and mcostalba committed Jan 9, 2017
1 parent d9dd520 commit e0504ab
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 26 deletions.
11 changes: 4 additions & 7 deletions src/movepick.cpp
View file
Expand Up @@ -140,7 +140,6 @@ void MovePicker::score<CAPTURES>() {
template<>
void MovePicker::score<QUIETS>() {

const HistoryStats& history = pos.this_thread()->history;
const FromToStats& fromTo = pos.this_thread()->fromTo;

const CounterMoveStats* cmh = (ss-1)->counterMoves;
Expand All @@ -150,26 +149,24 @@ void MovePicker::score<QUIETS>() {
Color c = pos.side_to_move();

for (auto& m : *this)
m.value = history[pos.moved_piece(m)][to_sq(m)]
+ (cmh ? (*cmh)[pos.moved_piece(m)][to_sq(m)] : VALUE_ZERO)
m.value = (cmh ? (*cmh)[pos.moved_piece(m)][to_sq(m)] : VALUE_ZERO)
+ (fmh ? (*fmh)[pos.moved_piece(m)][to_sq(m)] : VALUE_ZERO)
+ (fmh2 ? (*fmh2)[pos.moved_piece(m)][to_sq(m)] : VALUE_ZERO)
+ fromTo.get(c, m);
}

template<>
void MovePicker::score<EVASIONS>() {
// Try captures ordered by MVV/LVA, then non-captures ordered by history value
const HistoryStats& history = pos.this_thread()->history;
// Try captures ordered by MVV/LVA, then non-captures ordered by stats heuristics
const FromToStats& fromTo = pos.this_thread()->fromTo;
Color c = pos.side_to_move();

for (auto& m : *this)
if (pos.capture(m))
m.value = PieceValue[MG][pos.piece_on(to_sq(m))]
- Value(type_of(pos.moved_piece(m))) + HistoryStats::Max;
- Value(type_of(pos.moved_piece(m))) + FromToStats::Max;
else
m.value = history[pos.moved_piece(m)][to_sq(m)] + fromTo.get(c, m);
m.value = fromTo.get(c, m);
}


Expand Down
8 changes: 3 additions & 5 deletions src/movepick.h
View file
Expand Up @@ -38,9 +38,6 @@
/// different origin but same destination and piece will be considered identical.
template<typename T, bool CM = false>
struct Stats {

static const Value Max = Value(1 << 28);

const T* operator[](Piece pc) const { return table[pc]; }
T* operator[](Piece pc) { return table[pc]; }
void clear() { std::memset(table, 0, sizeof(table)); }
Expand All @@ -59,12 +56,13 @@ struct Stats {
};

typedef Stats<Move> MoveStats;
typedef Stats<Value, false> HistoryStats;
typedef Stats<Value, true> CounterMoveStats;
typedef Stats<Value, true> CounterMoveStats;
typedef Stats<CounterMoveStats> CounterMoveHistoryStats;

struct FromToStats {

static const Value Max = Value(1 << 28);

Value get(Color c, Move m) const { return table[c][from_sq(m)][to_sq(m)]; }
void clear() { std::memset(table, 0, sizeof(table)); }
void update(Color c, Move m, Value v) {
Expand Down
21 changes: 8 additions & 13 deletions src/search.cpp
View file
Expand Up @@ -211,7 +211,6 @@ void Search::clear() {

for (Thread* th : Threads)
{
th->history.clear();
th->counterMoves.clear();
th->fromTo.clear();
th->counterMoveHistory.clear();
Expand Down Expand Up @@ -642,7 +641,7 @@ namespace {
&& (ttValue >= beta ? (tte->bound() & BOUND_LOWER)
: (tte->bound() & BOUND_UPPER)))
{
// If ttMove is quiet, update killers, history, counter move on TT hit
// If ttMove is quiet, update move sorting heuristics on TT hit
if (ttValue >= beta && ttMove)
{
if (!pos.capture_or_promotion(ttMove))
Expand Down Expand Up @@ -983,12 +982,11 @@ namespace {
&& !pos.see_ge(make_move(to_sq(move), from_sq(move)), VALUE_ZERO))
r -= 2 * ONE_PLY;

ss->history = thisThread->history[moved_piece][to_sq(move)]
+ (cmh ? (*cmh )[moved_piece][to_sq(move)] : VALUE_ZERO)
+ (fmh ? (*fmh )[moved_piece][to_sq(move)] : VALUE_ZERO)
+ (fmh2 ? (*fmh2)[moved_piece][to_sq(move)] : VALUE_ZERO)
+ thisThread->fromTo.get(~pos.side_to_move(), move)
- 8000; // Correction factor
ss->history = (cmh ? (*cmh )[moved_piece][to_sq(move)] : VALUE_ZERO)
+ (fmh ? (*fmh )[moved_piece][to_sq(move)] : VALUE_ZERO)
+ (fmh2 ? (*fmh2)[moved_piece][to_sq(move)] : VALUE_ZERO)
+ thisThread->fromTo.get(~pos.side_to_move(), move)
- 8000; // Correction factor

// Decrease/increase reduction by comparing opponent's stat score
if (ss->history > VALUE_ZERO && (ss-1)->history < VALUE_ZERO)
Expand Down Expand Up @@ -1118,7 +1116,7 @@ namespace {
else if (bestMove)
{

// Quiet best move: update killers, history and countermoves
// Quiet best move: update move sorting heuristics
if (!pos.capture_or_promotion(bestMove))
update_stats(pos, ss, bestMove, quietsSearched, quietCount, bonus(depth));

Expand Down Expand Up @@ -1404,8 +1402,7 @@ namespace {
}


// update_stats() updates killers, history, countermove and countermove plus
// follow-up move history when a new quiet best move is found.
// update_stats() updates move sorting heuristics when a new quiet best move is found

void update_stats(const Position& pos, Stack* ss, Move move,
Move* quiets, int quietsCnt, Value bonus) {
Expand All @@ -1419,7 +1416,6 @@ namespace {
Color c = pos.side_to_move();
Thread* thisThread = pos.this_thread();
thisThread->fromTo.update(c, move, bonus);
thisThread->history.update(pos.moved_piece(move), to_sq(move), bonus);
update_cm_stats(ss, pos.moved_piece(move), to_sq(move), bonus);

if ((ss-1)->counterMoves)
Expand All @@ -1432,7 +1428,6 @@ namespace {
for (int i = 0; i < quietsCnt; ++i)
{
thisThread->fromTo.update(c, quiets[i], -bonus);
thisThread->history.update(pos.moved_piece(quiets[i]), to_sq(quiets[i]), -bonus);
update_cm_stats(ss, pos.moved_piece(quiets[i]), to_sq(quiets[i]), -bonus);
}
}
Expand Down
1 change: 0 additions & 1 deletion src/thread.h
View file
Expand Up @@ -69,7 +69,6 @@ class Thread {
Depth rootDepth;
Depth completedDepth;
std::atomic_bool resetCalls;
HistoryStats history;
MoveStats counterMoves;
FromToStats fromTo;
CounterMoveHistoryStats counterMoveHistory;
Expand Down

0 comments on commit e0504ab

Please sign in to comment.