mirror of
https://github.com/sockspls/badfish
synced 2025-04-30 08:43:09 +00:00
Retire move_to_san()
Now "Write Search Log" will pring moves in UCI format, consistent with all the rest. This functionality is not aimed at end-users anyway. It's hardly useful at all, in fact. Also, pretty-printing SAN moves is something that better belongs in the GUI than in the engine. No functional change.
This commit is contained in:
lucasart
parent
880e3cd7c8
commit
a903ed07e0
3 changed files with 8 additions and 106 deletions
102
src/notation.cpp
102
src/notation.cpp
|
|
@ -97,82 +97,6 @@ Move move_from_uci(const Position& pos, string& str) {
|
|||
}
|
||||
|
||||
|
||||
/// move_to_san() takes a position and a legal Move as input and returns its
|
||||
/// short algebraic notation representation.
|
||||
|
||||
const string move_to_san(Position& pos, Move m) {
|
||||
|
||||
if (m == MOVE_NONE)
|
||||
return "(none)";
|
||||
|
||||
if (m == MOVE_NULL)
|
||||
return "(null)";
|
||||
|
||||
assert(MoveList<LEGAL>(pos).contains(m));
|
||||
|
||||
Bitboard others, b;
|
||||
string san;
|
||||
Color us = pos.side_to_move();
|
||||
Square from = from_sq(m);
|
||||
Square to = to_sq(m);
|
||||
Piece pc = pos.piece_on(from);
|
||||
PieceType pt = type_of(pc);
|
||||
|
||||
if (type_of(m) == CASTLING)
|
||||
san = to > from ? "O-O" : "O-O-O";
|
||||
else
|
||||
{
|
||||
if (pt != PAWN)
|
||||
{
|
||||
san = PieceToChar[WHITE][pt]; // Upper case
|
||||
|
||||
// A disambiguation occurs if we have more then one piece of type 'pt'
|
||||
// that can reach 'to' with a legal move.
|
||||
others = b = (pos.attacks_from(pc, to) & pos.pieces(us, pt)) ^ from;
|
||||
|
||||
while (b)
|
||||
{
|
||||
Square s = pop_lsb(&b);
|
||||
if (!pos.legal(make_move(s, to), pos.pinned_pieces(us)))
|
||||
others ^= s;
|
||||
}
|
||||
|
||||
if (!others)
|
||||
{ /* Disambiguation is not needed */ }
|
||||
|
||||
else if (!(others & file_bb(from)))
|
||||
san += to_char(file_of(from));
|
||||
|
||||
else if (!(others & rank_bb(from)))
|
||||
san += to_char(rank_of(from));
|
||||
|
||||
else
|
||||
san += to_string(from);
|
||||
}
|
||||
else if (pos.capture(m))
|
||||
san = to_char(file_of(from));
|
||||
|
||||
if (pos.capture(m))
|
||||
san += 'x';
|
||||
|
||||
san += to_string(to);
|
||||
|
||||
if (type_of(m) == PROMOTION)
|
||||
san += string("=") + PieceToChar[WHITE][promotion_type(m)];
|
||||
}
|
||||
|
||||
if (pos.gives_check(m, CheckInfo(pos)))
|
||||
{
|
||||
StateInfo st;
|
||||
pos.do_move(m, st);
|
||||
san += MoveList<LEGAL>(pos).size() ? "+" : "#";
|
||||
pos.undo_move(m);
|
||||
}
|
||||
|
||||
return san;
|
||||
}
|
||||
|
||||
|
||||
/// pretty_pv() formats human-readable search information, typically to be
|
||||
/// appended to the search log file. It uses the two helpers below to pretty
|
||||
/// format the time and score respectively.
|
||||
|
|
@ -212,16 +136,12 @@ static string format(Value v) {
|
|||
return ss.str();
|
||||
}
|
||||
|
||||
string pretty_pv(Position& pos, int depth, Value value, int64_t msecs, Move pv[]) {
|
||||
string pretty_pv(const Position& pos, int depth, Value value, int64_t msecs, Move pv[]) {
|
||||
|
||||
const uint64_t K = 1000;
|
||||
const uint64_t M = 1000000;
|
||||
|
||||
std::stack<StateInfo> st;
|
||||
Move* m = pv;
|
||||
string san, str, padding;
|
||||
stringstream ss;
|
||||
|
||||
ss << setw(2) << depth << setw(8) << format(value) << setw(8) << format(msecs);
|
||||
|
||||
if (pos.nodes_searched() < M)
|
||||
|
|
@ -233,24 +153,10 @@ string pretty_pv(Position& pos, int depth, Value value, int64_t msecs, Move pv[]
|
|||
else
|
||||
ss << setw(7) << pos.nodes_searched() / M << "M ";
|
||||
|
||||
str = ss.str();
|
||||
padding = string(str.length(), ' ');
|
||||
string str = ss.str();
|
||||
|
||||
while (*m != MOVE_NONE)
|
||||
{
|
||||
san = move_to_san(pos, *m) + ' ';
|
||||
|
||||
if ((str.length() + san.length()) % 80 <= san.length()) // Exceed 80 cols
|
||||
str += "\n" + padding;
|
||||
|
||||
str += san;
|
||||
|
||||
st.push(StateInfo());
|
||||
pos.do_move(*m++, st.top());
|
||||
}
|
||||
|
||||
while (m != pv)
|
||||
pos.undo_move(*--m);
|
||||
for (Move *m = pv; *m != MOVE_NONE; m++)
|
||||
str += move_to_uci(*m, pos.is_chess960()) + ' ';
|
||||
|
||||
return str;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,8 +29,7 @@ class Position;
|
|||
std::string score_to_uci(Value v, Value alpha = -VALUE_INFINITE, Value beta = VALUE_INFINITE);
|
||||
Move move_from_uci(const Position& pos, std::string& str);
|
||||
const std::string move_to_uci(Move m, bool chess960);
|
||||
const std::string move_to_san(Position& pos, Move m);
|
||||
std::string pretty_pv(Position& pos, int depth, Value score, int64_t msecs, Move pv[]);
|
||||
std::string pretty_pv(const Position& pos, int depth, Value score, int64_t msecs, Move pv[]);
|
||||
|
||||
inline char to_char(File f, bool tolower = true) {
|
||||
return char(f - FILE_A + (tolower ? 'a' : 'A'));
|
||||
|
|
|
|||
|
|
@ -232,12 +232,9 @@ void Search::think() {
|
|||
Log log(Options["Search Log Filename"]);
|
||||
log << "Nodes: " << RootPos.nodes_searched()
|
||||
<< "\nNodes/second: " << RootPos.nodes_searched() * 1000 / elapsed
|
||||
<< "\nBest move: " << move_to_san(RootPos, RootMoves[0].pv[0]);
|
||||
|
||||
StateInfo st;
|
||||
RootPos.do_move(RootMoves[0].pv[0], st);
|
||||
log << "\nPonder move: " << move_to_san(RootPos, RootMoves[0].pv[1]) << std::endl;
|
||||
RootPos.undo_move(RootMoves[0].pv[0]);
|
||||
<< "\nBest move: " << move_to_uci(RootMoves[0].pv[0], RootPos.is_chess960())
|
||||
<< "\nPonder move: " << move_to_uci(RootMoves[0].pv[1], RootPos.is_chess960())
|
||||
<< std::endl;
|
||||
}
|
||||
|
||||
finalize:
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue