From 4ead60e2a77892dbeedb36f4557da5eba2f0558b Mon Sep 17 00:00:00 2001 From: Marco Costalba Date: Sun, 13 Feb 2011 11:13:54 +0100 Subject: [PATCH] Write the LogFile only at the end of an iteration Skip writing fail high/low sequences. Note that we don't need fail high/low markers anymore in pretty_pv(). No functional change but some do/undo move sequences. Signed-off-by: Marco Costalba --- src/move.cpp | 8 +++----- src/move.h | 2 +- src/search.cpp | 44 ++++++++++++++++++-------------------------- 3 files changed, 22 insertions(+), 32 deletions(-) diff --git a/src/move.cpp b/src/move.cpp index 1b33ff68..12d6127a 100644 --- a/src/move.cpp +++ b/src/move.cpp @@ -179,12 +179,11 @@ const string move_to_san(Position& pos, Move m) { /// It is used to write search information to the log file (which is created /// when the UCI parameter "Use Search Log" is "true"). -const string pretty_pv(Position& pos, int time, int depth, - Value score, ValueType type, Move pv[]) { +const string pretty_pv(Position& pos, int depth, Value score, int time, Move pv[]) { const int64_t K = 1000; const int64_t M = 1000000; - const int startColumn = 29; + const int startColumn = 28; const size_t maxLength = 80 - startColumn; const string lf = string("\n") + string(startColumn, ' '); @@ -196,8 +195,7 @@ const string pretty_pv(Position& pos, int time, int depth, // First print depth, score, time and searched nodes... s << std::setw(2) << depth - << (type == VALUE_TYPE_LOWER ? " >" : type == VALUE_TYPE_UPPER ? " <" : " ") - << std::setw(7) << score_string(score) + << std::setw(8) << score_string(score) << std::setw(8) << time_string(time); if (pos.nodes_searched() < M) diff --git a/src/move.h b/src/move.h index 223d2a28..928bb9e4 100644 --- a/src/move.h +++ b/src/move.h @@ -192,6 +192,6 @@ class Position; extern const std::string move_to_uci(Move m, bool chess960); extern Move move_from_uci(const Position& pos, const std::string& str); extern const std::string move_to_san(Position& pos, Move m); -extern const std::string pretty_pv(Position& pos, int time, int depth, Value score, ValueType type, Move pv[]); +extern const std::string pretty_pv(Position& pos, int depth, Value score, int time, Move pv[]); #endif // !defined(MOVE_H_INCLUDED) diff --git a/src/search.cpp b/src/search.cpp index b7c86e42..c1cbc9ef 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -129,7 +129,7 @@ namespace { void extract_pv_from_tt(Position& pos); void insert_pv_in_tt(Position& pos); - std::string pv_info_to_uci(Position& pos, int depth, Value alpha, Value beta, int pvLine = 0); + std::string pv_info_to_uci(Position& pos, int depth, Value alpha, Value beta, int pvLine); int64_t nodes; Value pv_score; @@ -544,12 +544,13 @@ bool think(Position& pos, bool infinite, bool ponder, int time[], int increment[ std::string name = Options["Search Log Filename"].value(); LogFile.open(name.c_str(), std::ios::out | std::ios::app); - LogFile << "Searching: " << pos.to_fen() - << "\ninfinite: " << infinite - << " ponder: " << ponder - << " time: " << myTime - << " increment: " << myIncrement - << " moves to go: " << movesToGo << endl; + LogFile << "\nSearching: " << pos.to_fen() + << "\ninfinite: " << infinite + << " ponder: " << ponder + << " time: " << myTime + << " increment: " << myIncrement + << " moves to go: " << movesToGo + << endl; } // We're ready to start thinking. Call the iterative deepening loop function @@ -563,19 +564,14 @@ bool think(Position& pos, bool infinite, bool ponder, int time[], int increment[ if (UseLogFile) { - LogFile << "\nNodes: " << pos.nodes_searched() + LogFile << "Nodes: " << pos.nodes_searched() << "\nNodes/second: " << nps(pos) - << "\nBest move: " << move_to_san(pos, bestMove); + << "\nBest move: " << move_to_san(pos, bestMove); StateInfo st; pos.do_move(bestMove, st); - LogFile << "\nPonder move: " - << move_to_san(pos, ponderMove) // Works also with MOVE_NONE - << endl; - - // Return from think() with unchanged position - pos.undo_move(bestMove); - + LogFile << "\nPonder move: " << move_to_san(pos, ponderMove) << endl; + pos.undo_move(bestMove); // Return from think() with unchanged position LogFile.close(); } @@ -701,6 +697,9 @@ namespace { bestValues[depth] = value; bestMoveChanges[depth] = Rml.bestMoveChanges; + if (UseLogFile) + LogFile << pretty_pv(pos, depth, value, current_search_time(), Rml[0].pv) << endl; + // Drop the easy move if differs from the new best move if (bestMove != easyMove) easyMove = MOVE_NONE; @@ -1880,7 +1879,7 @@ split_point_start: // At split points actual search starts from here if (abs(v) < VALUE_MATE - PLY_MAX * ONE_PLY) s << "cp " << int(v) * 100 / int(PawnValueMidgame); // Scale to centipawns else - s << "mate " << (v > 0 ? (VALUE_MATE - v + 1) / 2 : -(VALUE_MATE + v) / 2 ); + s << "mate " << (v > 0 ? (VALUE_MATE - v + 1) / 2 : -(VALUE_MATE + v) / 2); return s.str(); } @@ -2528,8 +2527,8 @@ split_point_start: // At split points actual search starts from here } // pv_info_to_uci() returns a string with information on the current PV line - // formatted according to UCI specification and eventually writes the info - // to a log file. It is called at each iteration or after a new pv is found. + // formatted according to UCI specification. It is called at each iteration + // or after a new pv is found. std::string RootMove::pv_info_to_uci(Position& pos, int depth, Value alpha, Value beta, int pvLine) { @@ -2549,13 +2548,6 @@ split_point_start: // At split points actual search starts from here << " nps " << nps(pos) << " pv " << l.str(); - if (UseLogFile && pvLine == 0) - { - ValueType t = pv_score >= beta ? VALUE_TYPE_LOWER : - pv_score <= alpha ? VALUE_TYPE_UPPER : VALUE_TYPE_EXACT; - - LogFile << pretty_pv(pos, current_search_time(), depth, pv_score, t, pv) << endl; - } return s.str(); } -- 2.39.2