X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsan.cpp;h=0e9b531003cb9c69595b84ee6540aec4d0689532;hp=c8292462ad5019c264ff1901a0c2c9f63f7d77ca;hb=18cd83a38042a3993678e88bc8163ceb1cbd62b4;hpb=66d165921d32058853830891db8ac60fedc46bd4 diff --git a/src/san.cpp b/src/san.cpp index c8292462..0e9b5310 100644 --- a/src/san.cpp +++ b/src/san.cpp @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008 Marco Costalba + Copyright (C) 2008-2009 Marco Costalba Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -28,10 +28,11 @@ #include #include +#include "history.h" #include "movepick.h" #include "san.h" -extern SearchStack EmptySearchStack; +using std::string; //// //// Local definitions @@ -39,8 +40,6 @@ extern SearchStack EmptySearchStack; namespace { - /// Types - enum Ambiguity { AMBIGUITY_NONE, AMBIGUITY_FILE, @@ -48,12 +47,11 @@ namespace { 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); } @@ -65,7 +63,7 @@ namespace { /// 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(const Position& pos, Move m) { assert(pos.is_ok()); assert(move_is_ok(m)); @@ -77,7 +75,7 @@ const std::string move_to_san(const Position& pos, Move m) { to = move_to(m); pt = type_of_piece(pos.piece_on(move_from(m))); - std::string san = ""; + string san = ""; if (m == MOVE_NONE) return "(none)"; @@ -115,10 +113,10 @@ const std::string move_to_san(const Position& pos, Move m) { 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 += piece_type_to_char(move_promotion_piece(m), true); } } // Is the move check? We don't use pos.move_is_check(m) here, because @@ -139,11 +137,11 @@ const std::string move_to_san(const Position& pos, Move m) { /// 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); // Castling moves if (movestr == "O-O-O" || movestr == "O-O-O+") @@ -167,7 +165,7 @@ Move move_from_san(const Position& pos, const std::string& movestr) { // 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; @@ -177,7 +175,7 @@ Move move_from_san(const Position& pos, const std::string& movestr) { 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'; @@ -275,7 +273,7 @@ Move move_from_san(const Position& pos, const std::string& movestr) { 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)))) { @@ -293,11 +291,11 @@ Move move_from_san(const Position& pos, const std::string& movestr) { /// 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); @@ -326,15 +324,16 @@ const std::string line_to_san(const Position& pos, Move line[], int startColumn, /// 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[]) { 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)? "<" : " ")); + s << std::setw(7) << score_string(score); // Time s << std::setw(8) << time_string(time) << " "; @@ -367,7 +366,7 @@ namespace { 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); Move mv, moveList[8]; int n = 0; @@ -397,7 +396,7 @@ namespace { } - const std::string time_string(int milliseconds) { + const string time_string(int milliseconds) { std::stringstream s; s << std::setfill('0'); @@ -414,7 +413,7 @@ namespace { } - const std::string score_string(Value v) { + const string score_string(Value v) { std::stringstream s;