From 7b4aa1070882cba085c9d6ed03d934734c395fe5 Mon Sep 17 00:00:00 2001 From: Marco Costalba Date: Sun, 24 Jun 2012 09:46:08 +0100 Subject: [PATCH] Rename move.cpp to notation.cpp No functional change. Signed-off-by: Marco Costalba --- src/Makefile | 2 +- src/move.cpp | 154 ------------------------------------------------------ src/notation.cpp | 154 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 155 insertions(+), 155 deletions(-) delete mode 100644 src/move.cpp create mode 100644 src/notation.cpp diff --git a/src/Makefile b/src/Makefile index 782971e..2a03492 100644 --- a/src/Makefile +++ b/src/Makefile @@ -32,7 +32,7 @@ PGOBENCH = ./$(EXE) bench 32 1 10 default depth ### Object files OBJS = benchmark.o bitbase.o bitboard.o book.o endgame.o evaluate.o main.o \ - material.o misc.o move.o movegen.o movepick.o pawns.o position.o \ + material.o misc.o movegen.o movepick.o notation.o pawns.o position.o \ search.o thread.o timeman.o tt.o uci.o ucioption.o ### ========================================================================== diff --git a/src/move.cpp b/src/move.cpp deleted file mode 100644 index 8ea6ad5..0000000 --- a/src/move.cpp +++ /dev/null @@ -1,154 +0,0 @@ -/* - Stockfish, a UCI chess playing engine derived from Glaurung 2.1 - Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2012 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 - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Stockfish is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ - -#include -#include - -#include "movegen.h" -#include "position.h" - -using std::string; - -/// move_to_uci() converts a move to a string in coordinate notation -/// (g1f3, a7a8q, etc.). The only special case is castling moves, where we print -/// in the e1g1 notation in normal chess mode, and in e1h1 notation in chess960 -/// mode. Internally castle moves are always coded as "king captures rook". - -const string move_to_uci(Move m, bool chess960) { - - Square from = from_sq(m); - Square to = to_sq(m); - string promotion; - - if (m == MOVE_NONE) - return "(none)"; - - if (m == MOVE_NULL) - return "0000"; - - if (is_castle(m) && !chess960) - to = (to > from ? FILE_G : FILE_C) | rank_of(from); - - if (is_promotion(m)) - promotion = char(tolower(piece_type_to_char(promotion_type(m)))); - - return square_to_string(from) + square_to_string(to) + promotion; -} - - -/// move_from_uci() takes a position and a string representing a move in -/// simple coordinate notation and returns an equivalent legal Move if any. - -Move move_from_uci(const Position& pos, string& str) { - - if (str.length() == 5) // Junior could send promotion piece in uppercase - str[4] = char(tolower(str[4])); - - for (MoveList ml(pos); !ml.end(); ++ml) - if (str == move_to_uci(ml.move(), pos.is_chess960())) - return ml.move(); - - return MOVE_NONE; -} - - -/// 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(pos.move_is_legal(m)); - - Bitboard attackers; - bool ambiguousMove, ambiguousFile, ambiguousRank; - string san; - Square from = from_sq(m); - Square to = to_sq(m); - PieceType pt = type_of(pos.piece_on(from)); - - if (is_castle(m)) - san = to > from ? "O-O" : "O-O-O"; - else - { - if (pt != PAWN) - { - san = piece_type_to_char(pt); - - // Disambiguation if we have more then one piece with destination 'to' - // note that for pawns is not needed because starting file is explicit. - attackers = pos.attackers_to(to) & pos.pieces(pos.side_to_move(), pt); - attackers ^= from; - ambiguousMove = ambiguousFile = ambiguousRank = false; - - while (attackers) - { - Square sq = pop_1st_bit(&attackers); - - // Pinned pieces are not included in the possible sub-set - if (!pos.pl_move_is_legal(make_move(sq, to), pos.pinned_pieces())) - continue; - - ambiguousFile |= file_of(sq) == file_of(from); - ambiguousRank |= rank_of(sq) == rank_of(from); - ambiguousMove = true; - } - - if (ambiguousMove) - { - if (!ambiguousFile) - san += file_to_char(file_of(from)); - - else if (!ambiguousRank) - san += rank_to_char(rank_of(from)); - - else - san += square_to_string(from); - } - } - - if (pos.is_capture(m)) - { - if (pt == PAWN) - san += file_to_char(file_of(from)); - - san += 'x'; - } - - san += square_to_string(to); - - if (is_promotion(m)) - san += string("=") + piece_type_to_char(promotion_type(m)); - } - - if (pos.move_gives_check(m, CheckInfo(pos))) - { - StateInfo st; - pos.do_move(m, st); - san += MoveList(pos).size() ? "+" : "#"; - pos.undo_move(m); - } - - return san; -} diff --git a/src/notation.cpp b/src/notation.cpp new file mode 100644 index 0000000..8ea6ad5 --- /dev/null +++ b/src/notation.cpp @@ -0,0 +1,154 @@ +/* + Stockfish, a UCI chess playing engine derived from Glaurung 2.1 + Copyright (C) 2004-2008 Tord Romstad (Glaurung author) + Copyright (C) 2008-2012 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Stockfish is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#include +#include + +#include "movegen.h" +#include "position.h" + +using std::string; + +/// move_to_uci() converts a move to a string in coordinate notation +/// (g1f3, a7a8q, etc.). The only special case is castling moves, where we print +/// in the e1g1 notation in normal chess mode, and in e1h1 notation in chess960 +/// mode. Internally castle moves are always coded as "king captures rook". + +const string move_to_uci(Move m, bool chess960) { + + Square from = from_sq(m); + Square to = to_sq(m); + string promotion; + + if (m == MOVE_NONE) + return "(none)"; + + if (m == MOVE_NULL) + return "0000"; + + if (is_castle(m) && !chess960) + to = (to > from ? FILE_G : FILE_C) | rank_of(from); + + if (is_promotion(m)) + promotion = char(tolower(piece_type_to_char(promotion_type(m)))); + + return square_to_string(from) + square_to_string(to) + promotion; +} + + +/// move_from_uci() takes a position and a string representing a move in +/// simple coordinate notation and returns an equivalent legal Move if any. + +Move move_from_uci(const Position& pos, string& str) { + + if (str.length() == 5) // Junior could send promotion piece in uppercase + str[4] = char(tolower(str[4])); + + for (MoveList ml(pos); !ml.end(); ++ml) + if (str == move_to_uci(ml.move(), pos.is_chess960())) + return ml.move(); + + return MOVE_NONE; +} + + +/// 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(pos.move_is_legal(m)); + + Bitboard attackers; + bool ambiguousMove, ambiguousFile, ambiguousRank; + string san; + Square from = from_sq(m); + Square to = to_sq(m); + PieceType pt = type_of(pos.piece_on(from)); + + if (is_castle(m)) + san = to > from ? "O-O" : "O-O-O"; + else + { + if (pt != PAWN) + { + san = piece_type_to_char(pt); + + // Disambiguation if we have more then one piece with destination 'to' + // note that for pawns is not needed because starting file is explicit. + attackers = pos.attackers_to(to) & pos.pieces(pos.side_to_move(), pt); + attackers ^= from; + ambiguousMove = ambiguousFile = ambiguousRank = false; + + while (attackers) + { + Square sq = pop_1st_bit(&attackers); + + // Pinned pieces are not included in the possible sub-set + if (!pos.pl_move_is_legal(make_move(sq, to), pos.pinned_pieces())) + continue; + + ambiguousFile |= file_of(sq) == file_of(from); + ambiguousRank |= rank_of(sq) == rank_of(from); + ambiguousMove = true; + } + + if (ambiguousMove) + { + if (!ambiguousFile) + san += file_to_char(file_of(from)); + + else if (!ambiguousRank) + san += rank_to_char(rank_of(from)); + + else + san += square_to_string(from); + } + } + + if (pos.is_capture(m)) + { + if (pt == PAWN) + san += file_to_char(file_of(from)); + + san += 'x'; + } + + san += square_to_string(to); + + if (is_promotion(m)) + san += string("=") + piece_type_to_char(promotion_type(m)); + } + + if (pos.move_gives_check(m, CheckInfo(pos))) + { + StateInfo st; + pos.do_move(m, st); + san += MoveList(pos).size() ? "+" : "#"; + pos.undo_move(m); + } + + return san; +} -- 1.7.0.4