kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-07-11 19:49:14 +00:00
Code Issues Releases Wiki Activity

Introduce and use speed_to_uci()

Browse source 
And retire nps()

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2011-02-19 12:22:23 +01:00
parent 706b44a966
commit b3108547de
1 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/search.cpp
View file

@ -306,7 +306,7 @@ namespace {
int current_search_time(); int current_search_time();
std::string value_to_uci(Value v); std::string value_to_uci(Value v);
int nps(const Position& pos); std::string speed_to_uci(int64_t nodes);
void poll(const Position& pos); void poll(const Position& pos);
void wait_for_stop_or_ponderhit(); void wait_for_stop_or_ponderhit();
@ -558,14 +558,14 @@ bool think(Position& pos, bool infinite, bool ponder, int time[], int increment[
Move bestMove = id_loop(pos, searchMoves, &ponderMove); Move bestMove = id_loop(pos, searchMoves, &ponderMove);
// Print final search statistics // Print final search statistics
cout << "info nodes " << pos.nodes_searched() cout << "info" << speed_to_uci(pos.nodes_searched()) << endl;
<< " nps " << nps(pos)
<< " time " << current_search_time() << endl;
if (UseLogFile) if (UseLogFile)
{ {
int t = current_search_time();
LogFile << "Nodes: " << pos.nodes_searched() LogFile << "Nodes: " << pos.nodes_searched()
<< "\nNodes/second: " << nps(pos) << "\nNodes/second: " << (t > 0 ? int(pos.nodes_searched() * 1000 / t) : 0)
<< "\nBest move: " << move_to_san(pos, bestMove); << "\nBest move: " << move_to_san(pos, bestMove);
StateInfo st; StateInfo st;
@ -1028,9 +1028,7 @@ split_point_start: // At split points actual search starts from here
if (SendSearchedNodes) if (SendSearchedNodes)
{ {
SendSearchedNodes = false; SendSearchedNodes = false;
cout << "info nodes " << nodes cout << "info" << speed_to_uci(pos.nodes_searched()) << endl;
<< " nps " << nps(pos)
<< " time " << current_search_time() << endl;
} }
if (current_search_time() >= 1000) if (current_search_time() >= 1000)
@ -1858,6 +1856,14 @@ split_point_start: // At split points actual search starts from here
H.update_gain(pos.piece_on(move_to(m)), move_to(m), -(before + after)); H.update_gain(pos.piece_on(move_to(m)), move_to(m), -(before + after));
} }
// current_search_time() returns the number of milliseconds which have passed
// since the beginning of the current search.
int current_search_time() {
return get_system_time() - SearchStartTime;
}
// value_to_uci() converts a value to a string suitable for use with the UCI // value_to_uci() converts a value to a string suitable for use with the UCI
// protocol specifications: // protocol specifications:
@ -1879,21 +1885,19 @@ split_point_start: // At split points actual search starts from here
} }
// current_search_time() returns the number of milliseconds which have passed // speed_to_uci() returns a string with time stats of current search suitable
// since the beginning of the current search. // to be sent to UCI gui.
int current_search_time() { std::string speed_to_uci(int64_t nodes) {
return get_system_time() - SearchStartTime;
}
// nps() computes the current nodes/second count
int nps(const Position& pos) {
std::stringstream s;
int t = current_search_time(); int t = current_search_time();
return (t > 0 ? int((pos.nodes_searched() * 1000) / t) : 0);
s << " nodes " << nodes
<< " nps " << (t > 0 ? int(nodes * 1000 / t) : 0)
<< " time " << t;
return s.str();
} }
@ -2538,9 +2542,7 @@ split_point_start: // At split points actual search starts from here
<< " multipv " << pvLine + 1 << " multipv " << pvLine + 1
<< " score " << value_to_uci(pv_score) << " score " << value_to_uci(pv_score)
<< (pv_score >= beta ? " lowerbound" : pv_score <= alpha ? " upperbound" : "") << (pv_score >= beta ? " lowerbound" : pv_score <= alpha ? " upperbound" : "")
<< " time " << current_search_time() << speed_to_uci(pos.nodes_searched())
<< " nodes " << pos.nodes_searched()
<< " nps " << nps(pos)
<< " pv " << l.str(); << " pv " << l.str();
return s.str(); return s.str();