mirror of
https://github.com/sockspls/badfish
synced 2025-04-30 16:53:09 +00:00
Retire notation.cpp
Now we can finally retire notation.cpp and move UCI helpers under uci.cpp No functional change.
This commit is contained in:
Marco Costalba
Joona Kiiski
parent
2469daebb1
commit
9ba391c5cb
4 changed files with 80 additions and 107 deletions
|
|
@ -39,8 +39,8 @@ PGOBENCH = ./$(EXE) bench 32 1 1 default time
|
|||
|
||||
### Object files
|
||||
OBJS = benchmark.o bitbase.o bitboard.o endgame.o evaluate.o main.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
|
||||
material.o misc.o movegen.o movepick.o pawns.o position.o \
|
||||
search.o thread.o timeman.o tt.o uci.o ucioption.o
|
||||
|
||||
### ==========================================================================
|
||||
### Section 2. High-level Configuration
|
||||
|
|
|
|||
103
src/notation.cpp
103
src/notation.cpp
|
|
@ -1,103 +0,0 @@
|
|||
/*
|
||||
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
|
||||
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
|
||||
Copyright (C) 2008-2014 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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <cassert>
|
||||
#include <sstream>
|
||||
|
||||
#include "movegen.h"
|
||||
#include "position.h"
|
||||
#include "uci.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
static const char* PieceToChar[COLOR_NB] = { " PNBRQK", " pnbrqk" };
|
||||
|
||||
|
||||
/// score_to_uci() converts a Value to a string suitable for use with the UCI
|
||||
/// protocol specifications:
|
||||
///
|
||||
/// cp <x> The score from the engine's point of view in centipawns.
|
||||
/// mate <y> Mate in y moves, not plies. If the engine is getting mated
|
||||
/// use negative values for y.
|
||||
|
||||
string UCI::format_value(Value v, Value alpha, Value beta) {
|
||||
|
||||
stringstream ss;
|
||||
|
||||
if (abs(v) < VALUE_MATE_IN_MAX_PLY)
|
||||
ss << "cp " << v * 100 / PawnValueEg;
|
||||
else
|
||||
ss << "mate " << (v > 0 ? VALUE_MATE - v + 1 : -VALUE_MATE - v) / 2;
|
||||
|
||||
ss << (v >= beta ? " lowerbound" : v <= alpha ? " upperbound" : "");
|
||||
|
||||
return ss.str();
|
||||
}
|
||||
|
||||
|
||||
/// format_square() converts a Square to a string (g1, a7, etc.)
|
||||
|
||||
std::string UCI::format_square(Square s) {
|
||||
char ch[] = { 'a' + file_of(s), '1' + rank_of(s), 0 };
|
||||
return ch;
|
||||
}
|
||||
|
||||
|
||||
/// format_move() 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 castling moves are always encoded as "king captures rook".
|
||||
|
||||
string UCI::format_move(Move m, bool chess960) {
|
||||
|
||||
Square from = from_sq(m);
|
||||
Square to = to_sq(m);
|
||||
|
||||
if (m == MOVE_NONE)
|
||||
return "(none)";
|
||||
|
||||
if (m == MOVE_NULL)
|
||||
return "0000";
|
||||
|
||||
if (type_of(m) == CASTLING && !chess960)
|
||||
to = make_square(to > from ? FILE_G : FILE_C, rank_of(from));
|
||||
|
||||
string move = format_square(from) + format_square(to);
|
||||
|
||||
if (type_of(m) == PROMOTION)
|
||||
move += PieceToChar[BLACK][promotion_type(m)]; // Lower case
|
||||
|
||||
return move;
|
||||
}
|
||||
|
||||
|
||||
/// to_move() takes a position and a string representing a move in
|
||||
/// simple coordinate notation and returns an equivalent legal Move if any.
|
||||
|
||||
Move UCI::to_move(const Position& pos, string& str) {
|
||||
|
||||
if (str.length() == 5) // Junior could send promotion piece in uppercase
|
||||
str[4] = char(tolower(str[4]));
|
||||
|
||||
for (MoveList<LEGAL> it(pos); *it; ++it)
|
||||
if (str == format_move(*it, pos.is_chess960()))
|
||||
return *it;
|
||||
|
||||
return MOVE_NONE;
|
||||
}
|
||||
76
src/uci.cpp
76
src/uci.cpp
|
|
@ -23,6 +23,7 @@
|
|||
#include <string>
|
||||
|
||||
#include "evaluate.h"
|
||||
#include "movegen.h"
|
||||
#include "position.h"
|
||||
#include "search.h"
|
||||
#include "thread.h"
|
||||
|
|
@ -212,3 +213,78 @@ void UCI::loop(int argc, char* argv[]) {
|
|||
|
||||
Threads.wait_for_think_finished(); // Cannot quit whilst the search is running
|
||||
}
|
||||
|
||||
|
||||
/// format_value() converts a Value to a string suitable for use with the UCI
|
||||
/// protocol specifications:
|
||||
///
|
||||
/// cp <x> The score from the engine's point of view in centipawns.
|
||||
/// mate <y> Mate in y moves, not plies. If the engine is getting mated
|
||||
/// use negative values for y.
|
||||
|
||||
string UCI::format_value(Value v, Value alpha, Value beta) {
|
||||
|
||||
stringstream ss;
|
||||
|
||||
if (abs(v) < VALUE_MATE_IN_MAX_PLY)
|
||||
ss << "cp " << v * 100 / PawnValueEg;
|
||||
else
|
||||
ss << "mate " << (v > 0 ? VALUE_MATE - v + 1 : -VALUE_MATE - v) / 2;
|
||||
|
||||
ss << (v >= beta ? " lowerbound" : v <= alpha ? " upperbound" : "");
|
||||
|
||||
return ss.str();
|
||||
}
|
||||
|
||||
|
||||
/// format_square() converts a Square to a string (g1, a7, etc.)
|
||||
|
||||
std::string UCI::format_square(Square s) {
|
||||
|
||||
char ch[] = { 'a' + file_of(s), '1' + rank_of(s), 0 }; // Zero-terminating
|
||||
return ch;
|
||||
}
|
||||
|
||||
|
||||
/// format_move() 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 castling moves are always encoded as "king captures rook".
|
||||
|
||||
string UCI::format_move(Move m, bool chess960) {
|
||||
|
||||
Square from = from_sq(m);
|
||||
Square to = to_sq(m);
|
||||
|
||||
if (m == MOVE_NONE)
|
||||
return "(none)";
|
||||
|
||||
if (m == MOVE_NULL)
|
||||
return "0000";
|
||||
|
||||
if (type_of(m) == CASTLING && !chess960)
|
||||
to = make_square(to > from ? FILE_G : FILE_C, rank_of(from));
|
||||
|
||||
string move = format_square(from) + format_square(to);
|
||||
|
||||
if (type_of(m) == PROMOTION)
|
||||
move += " pnbrqk"[promotion_type(m)];
|
||||
|
||||
return move;
|
||||
}
|
||||
|
||||
|
||||
/// to_move() takes a position and a string representing a move in
|
||||
/// simple coordinate notation and returns an equivalent legal Move if any.
|
||||
|
||||
Move UCI::to_move(const Position& pos, string& str) {
|
||||
|
||||
if (str.length() == 5) // Junior could send promotion piece in uppercase
|
||||
str[4] = char(tolower(str[4]));
|
||||
|
||||
for (MoveList<LEGAL> it(pos); *it; ++it)
|
||||
if (str == format_move(*it, pos.is_chess960()))
|
||||
return *it;
|
||||
|
||||
return MOVE_NONE;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -67,10 +67,10 @@ private:
|
|||
void init(OptionsMap&);
|
||||
void loop(int argc, char* argv[]);
|
||||
|
||||
Move to_move(const Position& pos, std::string& str);
|
||||
std::string format_move(Move m, bool chess960);
|
||||
std::string format_value(Value v, Value alpha = -VALUE_INFINITE, Value beta = VALUE_INFINITE);
|
||||
std::string format_square(Square s);
|
||||
std::string format_move(Move m, bool chess960);
|
||||
Move to_move(const Position& pos, std::string& str);
|
||||
|
||||
} // namespace UCI
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue