From aad8c82cf693447d5ea075b5cb5819c8e26d8680 Mon Sep 17 00:00:00 2001 From: Marco Costalba Date: Tue, 29 Jun 2010 12:14:44 +0200 Subject: [PATCH] Code style triviality in san.cpp No functional change. Signed-off-by: Marco Costalba --- src/position.cpp | 6 ++-- src/san.cpp | 72 +++++++++++++++++++++++++----------------------- src/search.cpp | 19 ++++++------- 3 files changed, 50 insertions(+), 47 deletions(-) diff --git a/src/position.cpp b/src/position.cpp index 5026ed76..17680697 100644 --- a/src/position.cpp +++ b/src/position.cpp @@ -641,10 +641,10 @@ bool Position::move_is_check(Move m, const CheckInfo& ci) const { } } - // En passant capture with check? We have already handled the case + // En passant capture with check ? We have already handled the case // of direct checks and ordinary discovered check, the only case we - // need to handle is the unusual case of a discovered check through the - // captured pawn. + // need to handle is the unusual case of a discovered check through + // the captured pawn. if (move_is_ep(m)) { Square capsq = make_square(square_file(to), square_rank(from)); diff --git a/src/san.cpp b/src/san.cpp index f113e870..545fae8f 100644 --- a/src/san.cpp +++ b/src/san.cpp @@ -47,7 +47,7 @@ namespace { AMBIGUITY_BOTH }; - const History H; // used as dummy argument for MovePicker c'tor + const History H; // Used as dummy argument for MovePicker c'tor Ambiguity move_ambiguity(const Position& pos, Move m); const string time_string(int milliseconds); @@ -68,28 +68,25 @@ const string move_to_san(Position& pos, Move m) { assert(pos.is_ok()); assert(move_is_ok(m)); - Square from, to; - PieceType pt; - - from = move_from(m); - to = move_to(m); - pt = type_of_piece(pos.piece_on(move_from(m))); - - string san = ""; + string san; + Square from = move_from(m); + Square to = move_to(m); + PieceType pt = type_of_piece(pos.piece_on(move_from(m))); if (m == MOVE_NONE) return "(none)"; else if (m == MOVE_NULL) return "(null)"; - else if (move_is_long_castle(m) || (int(to - from) == -2 && pt == KING)) + else if (move_is_long_castle(m) || (int(to - from) == -2 && pt == KING)) san = "O-O-O"; - else if (move_is_short_castle(m) || (int(to - from) == 2 && pt == KING)) + else if (move_is_short_castle(m) || (int(to - from) == 2 && pt == KING)) san = "O-O"; else { if (pt != PAWN) { san += piece_type_to_char(pt, true); + switch (move_ambiguity(pos, m)) { case AMBIGUITY_NONE: break; @@ -115,13 +112,13 @@ const string move_to_san(Position& pos, Move m) { san += square_to_string(move_to(m)); if (move_is_promotion(m)) { - san += '='; + san += "="; san += piece_type_to_char(move_promotion_piece(m), true); } } - // Is the move check? We don't use pos.move_is_check(m) here, because - // Position::move_is_check doesn't detect all checks (not castling moves, - // promotions and en passant captures). + + // The move gives check ? We don't use pos.move_is_check() here + // because we need to test for mate after the move is done. StateInfo st; pos.do_move(m, st); if (pos.is_check()) @@ -301,21 +298,21 @@ const string line_to_san(const Position& pos, Move line[], int startColumn, bool size_t maxLength = 80 - startColumn; Position p(pos, pos.thread()); - for (int i = 0; line[i] != MOVE_NONE; i++) + for (Move* m = line; *m != MOVE_NONE; m++) { - moveStr = move_to_san(p, line[i]); + moveStr = move_to_san(p, *m); length += moveStr.length() + 1; if (breakLines && length > maxLength) { - s << '\n' << std::setw(startColumn) << ' '; + s << "\n" << std::setw(startColumn) << " "; length = moveStr.length() + 1; } s << moveStr << ' '; - if (line[i] == MOVE_NULL) + if (*m == MOVE_NULL) p.do_null_move(st); else - p.do_move(line[i], st); + p.do_move(*m, st); } return s.str(); } @@ -325,27 +322,31 @@ const string line_to_san(const Position& pos, Move line[], int startColumn, bool /// 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(const Position& pos, int time, int depth, - uint64_t nodes, Value score, ValueType type, Move pv[]) { +const string pretty_pv(const Position& pos, int time, int depth, uint64_t nodes, + Value score, ValueType type, Move pv[]) { + + const uint64_t K = 1000; + const uint64_t M = 1000000; + std::stringstream s; // Depth s << std::setw(2) << depth << " "; // Score - s << ((type == VALUE_TYPE_LOWER)? ">" : ((type == VALUE_TYPE_UPPER)? "<" : " ")); - s << std::setw(7) << score_string(score); + s << (type == VALUE_TYPE_LOWER ? ">" : type == VALUE_TYPE_UPPER ? "<" : " ") + << std::setw(7) << score_string(score); // Time s << std::setw(8) << time_string(time) << " "; // Nodes - if (nodes < 1000000ULL) - s << std::setw(8) << nodes << " "; - else if (nodes < 1000000000ULL) - s << std::setw(7) << nodes/1000ULL << 'k' << " "; + if (nodes < M) + s << std::setw(8) << nodes / 1 << " "; + else if (nodes < K * M) + s << std::setw(7) << nodes / K << "K "; else - s << std::setw(7) << nodes/1000000ULL << 'M' << " "; + s << std::setw(7) << nodes / M << "M "; // PV s << line_to_san(pos, pv, 30, true); @@ -398,14 +399,17 @@ namespace { } - const string time_string(int milliseconds) { + const string time_string(int millisecs) { + + const int MSecMinute = 1000 * 60; + const int MSecHour = 1000 * 60 * 60; std::stringstream s; s << std::setfill('0'); - int hours = milliseconds / (1000*60*60); - int minutes = (milliseconds - hours*1000*60*60) / (1000*60); - int seconds = (milliseconds - hours*1000*60*60 - minutes*1000*60) / 1000; + int hours = millisecs / MSecHour; + int minutes = (millisecs - hours * MSecHour) / MSecMinute; + int seconds = (millisecs - hours * MSecHour - minutes * MSecMinute) / 1000; if (hours) s << hours << ':'; @@ -421,7 +425,7 @@ namespace { if (v >= VALUE_MATE - 200) s << "#" << (VALUE_MATE - v + 1) / 2; - else if(v <= -VALUE_MATE + 200) + else if (v <= -VALUE_MATE + 200) s << "-#" << (VALUE_MATE + v) / 2; else { diff --git a/src/search.cpp b/src/search.cpp index 8ea1b718..99f3614d 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -312,7 +312,7 @@ namespace { void ponderhit(); void wait_for_stop_or_ponderhit(); void init_ss_array(SearchStack* ss, int size); - void print_pv_info(const Position& pos, Move* ss, Value alpha, Value beta, Value value); + void print_pv_info(const Position& pos, Move pv[], Value alpha, Value beta, Value value); #if !defined(_MSC_VER) void *init_thread(void *threadID); @@ -2245,29 +2245,28 @@ namespace { // print_pv_info() prints to standard output and eventually to log file information on // the current PV line. It is called at each iteration or after a new pv is found. - void print_pv_info(const Position& pos, Move* pv, Value alpha, Value beta, Value value) { + void print_pv_info(const Position& pos, Move pv[], Value alpha, Value beta, Value value) { cout << "info depth " << Iteration - << " score " << value_to_string(value) - << ((value >= beta) ? " lowerbound" : - ((value <= alpha)? " upperbound" : "")) + << " score " << value_to_string(value) + << (value >= beta ? " lowerbound" : value <= alpha ? " upperbound" : "") << " time " << current_search_time() << " nodes " << TM.nodes_searched() << " nps " << nps() << " pv "; - for (int j = 0; pv[j] != MOVE_NONE && j < PLY_MAX; j++) - cout << pv[j] << " "; + for (Move* m = pv; *m != MOVE_NONE; m++) + cout << *m << " "; cout << endl; if (UseLogFile) { - ValueType type = (value >= beta ? VALUE_TYPE_LOWER - : (value <= alpha ? VALUE_TYPE_UPPER : VALUE_TYPE_EXACT)); + ValueType t = value >= beta ? VALUE_TYPE_LOWER : + value <= alpha ? VALUE_TYPE_UPPER : VALUE_TYPE_EXACT; LogFile << pretty_pv(pos, current_search_time(), Iteration, - TM.nodes_searched(), value, type, pv) << endl; + TM.nodes_searched(), value, t, pv) << endl; } } -- 2.39.2