HCha/Stockfish
1
0
Fork 0
mirror of https://github.com/HChaZZY/Stockfish.git synced 2025-12-19 16:46:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of struct Time

Browse Source 
We just need the milliseconds of current system
time for our needs. This allows to simplify the
API.

No functional change.
This commit is contained in:
Marco Costalba
2012-09-04 09:38:51 +02:00
parent 5900ab76a0
commit b50ce5ebfb
6 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/search.cpp
View File

@@ -42,7 +42,7 @@ namespace Search {
LimitsType Limits;
std::vector<RootMove> RootMoves;
Position RootPosition;
Time SearchTime;
Time::point SearchTime;
StateStackPtr SetupStates;
}
@@ -290,7 +290,7 @@ void Search::think() {
if (Options["Use Search Log"])
{
int e = SearchTime.elapsed();
int e = Time::now() - SearchTime;
Log log(Options["Search Log Filename"]);
log << "Nodes: " << pos.nodes_searched()
@@ -398,7 +398,7 @@ namespace {
// Send full PV info to GUI if we are going to leave the loop or
// if we have a fail high/low and we are deep in the search.
if ((bestValue > alpha && bestValue < beta) || SearchTime.elapsed() > 2000)
if ((bestValue > alpha && bestValue < beta) || Time::now() - SearchTime > 2000)
sync_cout << uci_pv(pos, depth, alpha, beta) << sync_endl;
// In case of failing high/low increase aspiration window and
@@ -431,7 +431,7 @@ namespace {
if (!Signals.stop && Options["Use Search Log"])
{
Log log(Options["Search Log Filename"]);
log << pretty_pv(pos, depth, bestValue, SearchTime.elapsed(), &RootMoves[0].pv[0])
log << pretty_pv(pos, depth, bestValue, Time::now() - SearchTime, &RootMoves[0].pv[0])
<< std::endl;
}
@@ -451,14 +451,14 @@ namespace {
// Stop search if most of available time is already consumed. We
// probably don't have enough time to search the first move at the
// next iteration anyway.
if (SearchTime.elapsed() > (TimeMgr.available_time() * 62) / 100)
if (Time::now() - SearchTime > (TimeMgr.available_time() * 62) / 100)
stop = true;
// Stop search early if one move seems to be much better than others
if ( depth >= 12
&& !stop
&& ( (bestMoveNeverChanged && pos.captured_piece_type())
|| SearchTime.elapsed() > (TimeMgr.available_time() * 40) / 100))
|| Time::now() - SearchTime > (TimeMgr.available_time() * 40) / 100))
{
Value rBeta = bestValue - EasyMoveMargin;
(ss+1)->excludedMove = RootMoves[0].pv[0];
@@ -827,7 +827,7 @@ split_point_start: // At split points actual search starts from here
{
Signals.firstRootMove = (moveCount == 1);
if (thisThread == Threads.main_thread() && SearchTime.elapsed() > 2000)
if (thisThread == Threads.main_thread() && Time::now() - SearchTime > 2000)
sync_cout << "info depth " << depth / ONE_PLY
<< " currmove " << move_to_uci(move, Chess960)
<< " currmovenumber " << moveCount + PVIdx << sync_endl;
@@ -1494,7 +1494,7 @@ split_point_start: // At split points actual search starts from here
static RKISS rk;
// PRNG sequence should be not deterministic
for (int i = Time::now().msec() % 50; i > 0; i--)
for (int i = Time::now() % 50; i > 0; i--)
rk.rand<unsigned>();
// RootMoves are already sorted by score in descending order
@@ -1536,7 +1536,7 @@ split_point_start: // At split points actual search starts from here
string uci_pv(const Position& pos, int depth, Value alpha, Value beta) {
std::stringstream s;
int t = SearchTime.elapsed();
int t = Time::now() - SearchTime;
int selDepth = 0;
for (size_t i = 0; i < Threads.size(); i++)
@@ -1749,9 +1749,9 @@ void Thread::idle_loop() {
void check_time() {
static Time lastInfoTime = Time::now();
static Time::point lastInfoTime = Time::now();
if (lastInfoTime.elapsed() >= 1000)
if (Time::now() - lastInfoTime >= 1000)
{
lastInfoTime = Time::now();
dbg_print();
@@ -1760,7 +1760,7 @@ void check_time() {
if (Limits.ponder)
return;
int e = SearchTime.elapsed();
int e = Time::now() - SearchTime;
bool stillAtFirstMove = Signals.firstRootMove
&& !Signals.failedLowAtRoot
&& e > TimeMgr.available_time();