/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2009 Marco Costalba
+ Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include <string>
#include <sstream>
+#include "history.h"
#include "movepick.h"
#include "san.h"
-extern SearchStack EmptySearchStack;
+using std::string;
////
//// Local definitions
namespace {
- /// Types
-
enum Ambiguity {
AMBIGUITY_NONE,
AMBIGUITY_FILE,
AMBIGUITY_BOTH
};
-
- /// Functions
+ const History H; // Used as dummy argument for MovePicker c'tor
Ambiguity move_ambiguity(const Position& pos, Move m);
- const std::string time_string(int milliseconds);
- const std::string score_string(Value v);
+ const string time_string(int milliseconds);
+ const string score_string(Value v);
}
/// that the move is a legal move from the position. The return value is
/// a string containing the move in short algebraic notation.
-const std::string move_to_san(const Position& pos, Move m) {
+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)));
-
- std::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;
san += "x";
}
san += square_to_string(move_to(m));
- if (move_promotion(m))
+ if (move_is_promotion(m))
{
- san += '=';
- san += piece_type_to_char(move_promotion(m), true);
+ 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;
- Position p(pos);
- p.do_move(m, st);
- if (p.is_check())
- san += p.is_mate()? "#" : "+";
+ pos.do_move(m, st);
+ if (pos.is_check())
+ san += pos.is_mate() ? "#" : "+";
+ pos.undo_move(m);
return san;
}
/// the move is returned. On failure (i.e. if the string is unparsable, or
/// if the move is illegal or ambiguous), MOVE_NONE is returned.
-Move move_from_san(const Position& pos, const std::string& movestr) {
+Move move_from_san(const Position& pos, const string& movestr) {
assert(pos.is_ok());
- MovePicker mp = MovePicker(pos, false, MOVE_NONE, EmptySearchStack, OnePly);
+ MovePicker mp = MovePicker(pos, MOVE_NONE, OnePly, H);
+ Bitboard pinned = pos.pinned_pieces(pos.side_to_move());
// Castling moves
if (movestr == "O-O-O" || movestr == "O-O-O+")
{
Move m;
while ((m = mp.get_next_move()) != MOVE_NONE)
- if (move_is_long_castle(m) && pos.pl_move_is_legal(m))
+ if (move_is_long_castle(m) && pos.pl_move_is_legal(m, pinned))
return m;
return MOVE_NONE;
{
Move m;
while ((m = mp.get_next_move()) != MOVE_NONE)
- if (move_is_short_castle(m) && pos.pl_move_is_legal(m))
+ if (move_is_short_castle(m) && pos.pl_move_is_legal(m, pinned))
return m;
return MOVE_NONE;
// Normal moves. We use a simple FSM to parse the san string.
enum { START, TO_FILE, TO_RANK, PROMOTION_OR_CHECK, PROMOTION, CHECK, END };
- static const std::string pieceLetters = "KQRBN";
+ static const string pieceLetters = "KQRBN";
PieceType pt = NO_PIECE_TYPE, promotion = NO_PIECE_TYPE;
File fromFile = FILE_NONE, toFile = FILE_NONE;
Rank fromRank = RANK_NONE, toRank = RANK_NONE;
for (size_t i = 0; i < movestr.length(); i++)
{
char type, c = movestr[i];
- if (pieceLetters.find(c) != std::string::npos)
+ if (pieceLetters.find(c) != string::npos)
type = 'P';
else if (c >= 'a' && c <= 'h')
type = 'F';
while ((m = mp.get_next_move()) != MOVE_NONE)
if ( pos.type_of_piece_on(move_from(m)) == pt
&& move_to(m) == to
- && move_promotion(m) == promotion
+ && move_promotion_piece(m) == promotion
&& (fromFile == FILE_NONE || fromFile == square_file(move_from(m)))
&& (fromRank == RANK_NONE || fromRank == square_rank(move_from(m))))
{
/// length of 80 characters. After a line break, 'startColumn' spaces are
/// inserted at the beginning of the new line.
-const std::string line_to_san(const Position& pos, Move line[], int startColumn, bool breakLines) {
+const string line_to_san(const Position& pos, Move line[], int startColumn, bool breakLines) {
StateInfo st;
std::stringstream s;
- std::string moveStr;
+ string moveStr;
size_t length = 0;
size_t maxLength = 80 - startColumn;
- Position p(pos);
+ 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();
}
/// It is used to write search information to the log file (which is created
/// when the UCI parameter "Use Search Log" is "true").
-const std::string pretty_pv(const Position& pos, int time, int depth,
- uint64_t nodes, Value score, 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 << std::setw(8) << 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);
if (type_of_piece(pc) == KING)
return AMBIGUITY_NONE;
- MovePicker mp = MovePicker(pos, false, MOVE_NONE, EmptySearchStack, OnePly);
+ MovePicker mp = MovePicker(pos, MOVE_NONE, OnePly, H);
+ Bitboard pinned = pos.pinned_pieces(pos.side_to_move());
Move mv, moveList[8];
int n = 0;
while ((mv = mp.get_next_move()) != MOVE_NONE)
- if (move_to(mv) == to && pos.piece_on(move_from(mv)) == pc && pos.pl_move_is_legal(mv))
+ if (move_to(mv) == to && pos.piece_on(move_from(mv)) == pc && pos.pl_move_is_legal(mv, pinned))
moveList[n++] = mv;
if (n == 1)
}
- const std::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 << ':';
}
- const std::string score_string(Value v) {
+ const string score_string(Value v) {
std::stringstream s;
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
{