1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-04-30 00:33:09 +00:00

Moved the code for extracting the PV from the TT to tt.cpp, where

it belongs.
This commit is contained in:
Tord Romstad 2009-08-06 14:02:53 +02:00
parent da854fe83a
commit 2fff532f4e
3 changed files with 35 additions and 33 deletions

View file

@ -306,7 +306,6 @@ namespace {
void update_history(const Position& pos, Move m, Depth depth, Move movesSearched[], int moveCount);
void update_killers(Move m, SearchStack& ss);
void slowdown(const Position& pos);
void build_pv(const Position& pos, Move pv[]);
bool fail_high_ply_1();
int current_search_time();
@ -976,7 +975,7 @@ namespace {
// Update PV
rml.set_move_score(i, value);
update_pv(ss, 0);
build_pv(pos, ss[0].pv);
TT.extract_pv(pos, ss[0].pv);
rml.set_move_pv(i, ss[0].pv);
if (MultiPV == 1)
@ -2446,37 +2445,6 @@ namespace {
}
// build_pv() extends a PV by adding moves from the transposition table at
// the end. This should ensure that the PV is almost always at least two
// plies long, which is important, because otherwise we will often get
// single-move PVs when the search stops while failing high, and a
// single-move PV means that we don't have a ponder move.
void build_pv(const Position& pos, Move pv[]) {
int ply;
Position p(pos);
StateInfo st[100];
for (ply = 0; pv[ply] != MOVE_NONE; ply++)
p.do_move(pv[ply], st[ply]);
bool stop;
const TTEntry* tte;
for (stop = false, tte = TT.retrieve(p.get_key());
tte && tte->move() != MOVE_NONE && !stop;
tte = TT.retrieve(p.get_key()), ply++)
{
if (!move_is_legal(p, tte->move(), p.pinned_pieces(p.side_to_move())))
break;
pv[ply] = tte->move();
p.do_move(pv[ply], st[ply]);
for (int j = 0; j < ply; j++)
if (st[j].key == p.get_key()) stop = true;
}
pv[ply] = MOVE_NONE;
}
// fail_high_ply_1() checks if some thread is currently resolving a fail
// high at ply 1 at the node below the first root node. This information
// is used for time managment.

View file

@ -26,6 +26,7 @@
#include <cmath>
#include <cstring>
#include "movegen.h"
#include "tt.h"
@ -185,6 +186,38 @@ void TranspositionTable::insert_pv(const Position& pos, Move pv[]) {
}
/// TranspositionTable::extract_pv() extends a PV by adding moves from the
/// transposition table at the end. This should ensure that the PV is almost
/// always at least two plies long, which is important, because otherwise we
/// will often get single-move PVs when the search stops while failing high,
/// and a single-move PV means that we don't have a ponder move.
void TranspositionTable::extract_pv(const Position& pos, Move pv[]) {
int ply;
Position p(pos);
StateInfo st[100];
for (ply = 0; pv[ply] != MOVE_NONE; ply++)
p.do_move(pv[ply], st[ply]);
bool stop;
const TTEntry* tte;
for (stop = false, tte = retrieve(p.get_key());
tte && tte->move() != MOVE_NONE && !stop;
tte = retrieve(p.get_key()), ply++)
{
if (!move_is_legal(p, tte->move(), p.pinned_pieces(p.side_to_move())))
break;
pv[ply] = tte->move();
p.do_move(pv[ply], st[ply]);
for (int j = 0; j < ply; j++)
if (st[j].key == p.get_key()) stop = true;
}
pv[ply] = MOVE_NONE;
}
/// TranspositionTable::full() returns the permill of all transposition table
/// entries which have received at least one write during the current search.
/// It is used to display the "info hashfull ..." information in UCI.

View file

@ -87,6 +87,7 @@ public:
TTEntry* retrieve(const Key posKey) const;
void new_search();
void insert_pv(const Position& pos, Move pv[]);
void extract_pv(const Position& pos, Move pv[]);
int full() const;
private: