kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-04-29 16:23:09 +00:00
Code Issues Releases Wiki Activity

Move insert_pv() and extract_pv() out of TT class

Browse source 
These functions have little to do with TranspositionTable
class and more with the search and in particular with the PV
handling. So move them where they belong.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2010-07-21 08:31:11 +02:00
parent e2c0b5f995
commit 6f6f59ea6a
3 changed files with 60 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
src/search.cpp
View file

@ -309,6 +309,8 @@ namespace {
void wait_for_stop_or_ponderhit();
void init_ss_array(SearchStack* ss, int size);
void print_pv_info(const Position& pos, Move pv[], Value alpha, Value beta, Value value);
void insert_pv_in_tt(const Position& pos, Move pv[]);
void extract_pv_from_tt(const Position& pos, Move bestMove, Move pv[]);
#if !defined(_MSC_VER)
void *init_thread(void *threadID);
@ -628,7 +630,7 @@ namespace {
// Write PV to transposition table, in case the relevant entries have
// been overwritten during the search.
TT.insert_pv(p, pv);
insert_pv_in_tt(p, pv);
if (AbortSearch)
break; // Value cannot be trusted. Break out immediately!
@ -895,7 +897,7 @@ namespace {
// the score before research in case we run out of time while researching.
rml.set_move_score(i, value);
ss->bestMove = move;
TT.extract_pv(pos, move, pv, PLY_MAX);
extract_pv_from_tt(pos, move, pv);
rml.set_move_pv(i, pv);
// Print information to the standard output
@ -935,7 +937,7 @@ namespace {
// Update PV
rml.set_move_score(i, value);
ss->bestMove = move;
TT.extract_pv(pos, move, pv, PLY_MAX);
extract_pv_from_tt(pos, move, pv);
rml.set_move_pv(i, pv);
if (MultiPV == 1)
@ -2272,6 +2274,61 @@ namespace {
}
// insert_pv_in_tt() is called at the end of a search iteration, and inserts
// the PV back into the TT. This makes sure the old PV moves are searched
// first, even if the old TT entries have been overwritten.
void insert_pv_in_tt(const Position& pos, Move pv[]) {
StateInfo st;
TTEntry* tte;
Position p(pos, pos.thread());
EvalInfo ei;
Value v;
for (int i = 0; pv[i] != MOVE_NONE; i++)
{
tte = TT.retrieve(p.get_key());
if (!tte || tte->move() != pv[i])
{
v = (p.is_check() ? VALUE_NONE : evaluate(p, ei));
TT.store(p.get_key(), VALUE_NONE, VALUE_TYPE_NONE, DEPTH_NONE, pv[i], v, ei.kingDanger[pos.side_to_move()]);
}
p.do_move(pv[i], st);
}
}
// extract_pv_from_tt() builds a PV by adding moves from the transposition table.
// We consider also failing high nodes and not only VALUE_TYPE_EXACT nodes. This
// allow to always have a ponder move even when we fail high at root and also a
// long PV to print that is important for position analysis.
void extract_pv_from_tt(const Position& pos, Move bestMove, Move pv[]) {
StateInfo st;
TTEntry* tte;
Position p(pos, pos.thread());
int ply = 0;
assert(bestMove != MOVE_NONE);
pv[ply] = bestMove;
p.do_move(pv[ply++], st);
while ( (tte = TT.retrieve(p.get_key())) != NULL
&& tte->move() != MOVE_NONE
&& move_is_legal(p, tte->move())
&& ply < PLY_MAX
&& (!p.is_draw() || ply < 2))
{
pv[ply] = tte->move();
p.do_move(pv[ply++], st);
}
pv[ply] = MOVE_NONE;
}
// init_thread() is the function which is called when a new thread is
// launched. It simply calls the idle_loop() function with the supplied
// threadID. There are two versions of this function; one for POSIX

57
src/tt.cpp
View file

@ -26,7 +26,6 @@
#include <cstring>
#include "evaluate.h"
#include "movegen.h"
#include "tt.h"
// The main transposition table
@ -155,59 +154,3 @@ TTEntry* TranspositionTable::retrieve(const Key posKey) const {
void TranspositionTable::new_search() {
generation++;
}
/// TranspositionTable::insert_pv() is called at the end of a search
/// iteration, and inserts the PV back into the PV. This makes sure
/// the old PV moves are searched first, even if the old TT entries
/// have been overwritten.
void TranspositionTable::insert_pv(const Position& pos, Move pv[]) {
StateInfo st;
EvalInfo ei;
Value v;
Position p(pos, pos.thread());
for (int i = 0; pv[i] != MOVE_NONE; i++)
{
TTEntry *tte = retrieve(p.get_key());
if (!tte || tte->move() != pv[i])
{
v = (p.is_check() ? VALUE_NONE : evaluate(p, ei));
store(p.get_key(), VALUE_NONE, VALUE_TYPE_NONE, DEPTH_NONE, pv[i], v, ei.kingDanger[pos.side_to_move()]);
}
p.do_move(pv[i], st);
}
}
/// TranspositionTable::extract_pv() builds a PV by adding moves from the
/// transposition table. We consider also failing high nodes and not only
/// VALUE_TYPE_EXACT nodes. This allow to always have a ponder move even
/// when we fail high at root and also a long PV to print that is important
/// for position analysis.
void TranspositionTable::extract_pv(const Position& pos, Move bestMove, Move pv[], const int PLY_MAX) {
const TTEntry* tte;
StateInfo st;
Position p(pos, pos.thread());
int ply = 0;
assert(bestMove != MOVE_NONE);
pv[ply] = bestMove;
p.do_move(pv[ply++], st);
while ( (tte = retrieve(p.get_key())) != NULL
&& tte->move() != MOVE_NONE
&& move_is_legal(p, tte->move())
&& (!p.is_draw() || ply < 2)
&& ply < PLY_MAX)
{
pv[ply] = tte->move();
p.do_move(pv[ply++], st);
}
pv[ply] = MOVE_NONE;
}

2
src/tt.h
View file

@ -111,8 +111,6 @@ public:
void store(const Key posKey, Value v, ValueType type, Depth d, Move m, Value statV, Value kingD);
TTEntry* retrieve(const Key posKey) const;
void new_search();
void insert_pv(const Position& pos, Move pv[]);
void extract_pv(const Position& pos, Move bestMove, Move pv[], const int PLY_MAX);
TTEntry* first_entry(const Key posKey) const;
private: