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

Use only cumulativeNodes in RootMoveList

Browse source 
And rename in nodes now that we have only one.

After the beta-cut off counters removing we can
get rid also of this one.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2010-08-30 09:58:52 +02:00
parent b177e6dd91
commit 427dc2a82c
1 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/search.cpp
View file

@ -114,7 +114,7 @@ namespace {
struct RootMove { struct RootMove {
RootMove() : mp_score(0), nodes(0), cumulativeNodes(0) {} RootMove() : mp_score(0), nodes(0) {}
// RootMove::operator<() is the comparison function used when // RootMove::operator<() is the comparison function used when
// sorting the moves. A move m1 is considered to be better // sorting the moves. A move m1 is considered to be better
@ -128,7 +128,7 @@ namespace {
Move move; Move move;
Value score; Value score;
int mp_score; int mp_score;
int64_t nodes, cumulativeNodes; int64_t nodes;
Move pv[PLY_MAX_PLUS_2]; Move pv[PLY_MAX_PLUS_2];
}; };
@ -146,10 +146,10 @@ namespace {
Value get_move_score(int moveNum) const { return moves[moveNum].score; } Value get_move_score(int moveNum) const { return moves[moveNum].score; }
void set_move_score(int moveNum, Value score) { moves[moveNum].score = score; } void set_move_score(int moveNum, Value score) { moves[moveNum].score = score; }
Move get_move_pv(int moveNum, int i) const { return moves[moveNum].pv[i]; } Move get_move_pv(int moveNum, int i) const { return moves[moveNum].pv[i]; }
int64_t get_move_cumulative_nodes(int moveNum) const { return moves[moveNum].cumulativeNodes; } int64_t get_move_nodes(int moveNum) const { return moves[moveNum].nodes; }
void score_moves(const Position& pos); void score_moves(const Position& pos);
void set_move_nodes(int moveNum, int64_t nodes); void add_move_nodes(int moveNum, int64_t nodes) { moves[moveNum].nodes += nodes; }
void set_move_pv(int moveNum, const Move pv[]); void set_move_pv(int moveNum, const Move pv[]);
void sort(); void sort();
void sort_multipv(int n); void sort_multipv(int n);
@ -629,9 +629,9 @@ namespace {
int64_t nodes = ThreadsMgr.nodes_searched(); int64_t nodes = ThreadsMgr.nodes_searched();
if ( Iteration >= 8 if ( Iteration >= 8
&& EasyMove == pv[0] && EasyMove == pv[0]
&& ( ( rml.get_move_cumulative_nodes(0) > (nodes * 85) / 100 && ( ( rml.get_move_nodes(0) > (nodes * 85) / 100
&& current_search_time() > TimeMgr.available_time() / 16) && current_search_time() > TimeMgr.available_time() / 16)
||( rml.get_move_cumulative_nodes(0) > (nodes * 98) / 100 ||( rml.get_move_nodes(0) > (nodes * 98) / 100
&& current_search_time() > TimeMgr.available_time() / 32))) && current_search_time() > TimeMgr.available_time() / 32)))
stopSearch = true; stopSearch = true;
@ -883,7 +883,7 @@ namespace {
break; break;
// Remember searched nodes counts for this move // Remember searched nodes counts for this move
rml.set_move_nodes(i, ThreadsMgr.nodes_searched() - nodes); rml.add_move_nodes(i, ThreadsMgr.nodes_searched() - nodes);
assert(value >= -VALUE_INFINITE && value <= VALUE_INFINITE); assert(value >= -VALUE_INFINITE && value <= VALUE_INFINITE);
assert(value < beta); assert(value < beta);
@ -2785,12 +2785,6 @@ namespace {
// RootMoveList simple methods definitions // RootMoveList simple methods definitions
void RootMoveList::set_move_nodes(int moveNum, int64_t nodes) {
moves[moveNum].nodes = nodes;
moves[moveNum].cumulativeNodes += nodes;
}
void RootMoveList::set_move_pv(int moveNum, const Move pv[]) { void RootMoveList::set_move_pv(int moveNum, const Move pv[]) {
int j; int j;