kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-05-01 09:13:08 +00:00
Code Issues Releases Wiki Activity

Merge line_to_san() into pretty_pv()

Browse source 
No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2011-01-08 18:31:14 +01:00
parent b4acf83704
commit c89762288b
2 changed files with 30 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
src/move.cpp
View file

@ -174,42 +174,6 @@ const string move_to_san(Position& pos, Move m) {
} }
/// line_to_san() takes a position and a line (an array of moves representing
/// a sequence of legal moves from the position) as input, and returns a
/// string containing the line in short algebraic notation. If the boolean
/// parameter 'breakLines' is true, line breaks are inserted, with a line
/// length of 80 characters. After a line break, 'startColumn' spaces are
/// inserted at the beginning of the new line.
const string line_to_san(const Position& pos, Move line[], int startColumn, bool breakLines) {
StateInfo st;
std::stringstream s;
string moveStr;
size_t length = 0;
size_t maxLength = 80 - startColumn;
Position p(pos, pos.thread());
for (Move* m = line; *m != MOVE_NONE; m++)
{
moveStr = move_to_san(p, *m);
length += moveStr.length() + 1;
if (breakLines && length > maxLength)
{
s << "\n" << std::setw(startColumn) << " ";
length = moveStr.length() + 1;
}
s << moveStr << ' ';
if (*m == MOVE_NULL)
p.do_null_move(st);
else
p.do_move(*m, st);
}
return s.str();
}
/// pretty_pv() creates a human-readable string from a position and a PV. /// pretty_pv() creates a human-readable string from a position and a PV.
/// It is used to write search information to the log file (which is created /// It is used to write search information to the log file (which is created
/// when the UCI parameter "Use Search Log" is "true"). /// when the UCI parameter "Use Search Log" is "true").
@ -219,20 +183,23 @@ const string pretty_pv(const Position& pos, int time, int depth,
const int64_t K = 1000; const int64_t K = 1000;
const int64_t M = 1000000; const int64_t M = 1000000;
const int startColumn = 29;
const size_t maxLength = 80 - startColumn;
const string lf = string("\n") + string(startColumn, ' ');
StateInfo st;
std::stringstream s; std::stringstream s;
string san;
size_t length = 0;
// Depth Position p(pos, pos.thread());
s << std::setw(2) << depth << " ";
// Score // First print depth, score, time and searched nodes...
s << (type == VALUE_TYPE_LOWER ? ">" : type == VALUE_TYPE_UPPER ? "<" : " ") s << std::setw(2) << depth
<< std::setw(7) << score_string(score); << (type == VALUE_TYPE_LOWER ? " >" : type == VALUE_TYPE_UPPER ? " <" : " ")
<< std::setw(7) << score_string(score)
<< std::setw(8) << time_string(time);
// Time
s << std::setw(8) << time_string(time) << " ";
// Nodes
if (pos.nodes_searched() < M) if (pos.nodes_searched() < M)
s << std::setw(8) << pos.nodes_searched() / 1 << " "; s << std::setw(8) << pos.nodes_searched() / 1 << " ";
else if (pos.nodes_searched() < K * M) else if (pos.nodes_searched() < K * M)
@ -240,8 +207,21 @@ const string pretty_pv(const Position& pos, int time, int depth,
else else
s << std::setw(7) << pos.nodes_searched() / M << " M "; s << std::setw(7) << pos.nodes_searched() / M << " M ";
// PV // ...then print the full PV line in short algebraic notation
s << line_to_san(pos, pv, 30, true); for (Move* m = pv; *m != MOVE_NONE; m++)
{
san = move_to_san(p, *m);
length += san.length() + 1;
if (length > maxLength)
{
length = san.length() + 1;
s << lf;
}
s << san << ' ';
p.do_move(*m, st);
}
return s.str(); return s.str();
} }

1
src/move.h
View file

@ -192,7 +192,6 @@ class Position;
extern const std::string move_to_uci(Move m, bool chess960); extern const std::string move_to_uci(Move m, bool chess960);
extern Move move_from_uci(const Position& pos, const std::string& str); 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 move_to_san(Position& pos, Move m);
extern const std::string line_to_san(const Position& pos, Move line[], int startColumn, bool breakLines);
extern const std::string pretty_pv(const Position& pos, int time, int depth, Value score, ValueType type, Move pv[]); extern const std::string pretty_pv(const Position& pos, int time, int depth, Value score, ValueType type, Move pv[]);
#endif // !defined(MOVE_H_INCLUDED) #endif // !defined(MOVE_H_INCLUDED)