From: Marco Costalba Date: Sat, 30 Nov 2013 10:25:05 +0000 (+0100) Subject: Rename Bitboards print to pretty X-Git-Url: https://git.sesse.net/?p=stockfish;a=commitdiff_plain;h=5f2bf91ad18069e77e5c0e32c387b2200abd94d9 Rename Bitboards print to pretty To align to same named Position function and avoid using std::cout directly. Also remove some stale include while there. No functional change. --- diff --git a/src/bitboard.cpp b/src/bitboard.cpp index a6502330..84405411 100644 --- a/src/bitboard.cpp +++ b/src/bitboard.cpp @@ -19,11 +19,10 @@ #include #include -#include +#include #include "bitboard.h" #include "bitcount.h" -#include "misc.h" #include "rkiss.h" CACHE_LINE_ALIGNMENT @@ -126,23 +125,24 @@ Square msb(Bitboard b) { #endif // ifndef USE_BSFQ -/// Bitboards::print() prints a bitboard in an easily readable format to the -/// standard output. This is sometimes useful for debugging. +/// Bitboards::pretty() returns an ASCII representation of a bitboard to be +/// printed to standard output. This is sometimes useful for debugging. -void Bitboards::print(Bitboard b) { +const std::string Bitboards::pretty(Bitboard b) { - sync_cout; + std::ostringstream ss; for (Rank rank = RANK_8; rank >= RANK_1; --rank) { - std::cout << "+---+---+---+---+---+---+---+---+" << '\n'; + ss << "+---+---+---+---+---+---+---+---+" << '\n'; for (File file = FILE_A; file <= FILE_H; ++file) - std::cout << "| " << (b & (file | rank) ? "X " : " "); + ss << "| " << (b & (file | rank) ? "X " : " "); - std::cout << "|\n"; + ss << "|\n"; } - std::cout << "+---+---+---+---+---+---+---+---+" << sync_endl; + ss << "+---+---+---+---+---+---+---+---+"; + return ss.str(); } diff --git a/src/bitboard.h b/src/bitboard.h index 34900578..ecff5c3a 100644 --- a/src/bitboard.h +++ b/src/bitboard.h @@ -26,7 +26,7 @@ namespace Bitboards { void init(); -void print(Bitboard b); +const std::string pretty(Bitboard b); } diff --git a/src/book.cpp b/src/book.cpp index ec0a0f83..8d021ab2 100644 --- a/src/book.cpp +++ b/src/book.cpp @@ -25,7 +25,6 @@ #include #include -#include #include "book.h" #include "misc.h" diff --git a/src/position.cpp b/src/position.cpp index ca7c4600..d141b488 100644 --- a/src/position.cpp +++ b/src/position.cpp @@ -21,7 +21,6 @@ #include #include #include -#include #include #include "bitcount.h" @@ -34,8 +33,6 @@ #include "tt.h" using std::string; -using std::cout; -using std::endl; static const string PieceToChar(" PNBRQK pnbrqk");