kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-04-29 16:23:09 +00:00
Code Issues Releases Wiki Activity

Another attempt at fixing Chess960

Browse source 
Keep the isChess960 flag inside Position so that is
copied with the Position, but esplicitly highlight the
fact that a FEN string has not enough information to detect
Chess960 in general case. To do this add a boolean argument
isChess960 to from_fen() function so to self document this
shortcoming of FEN notation.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2011-01-03 12:50:49 +01:00
parent 2bb555025f
commit f200f3ccd2
6 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/benchmark.cpp
View file

@ -125,7 +125,7 @@ void benchmark(int argc, char* argv[]) {
{
Move moves[1] = { MOVE_NONE };
int dummy[2] = { 0, 0 };
Position pos(*it, 0);
Position pos(*it, false, 0);
cerr << "\nBench position: " << cnt << '/' << positions.size() << endl << endl;
if (valType == "perft")
{

2
src/evaluate.cpp
View file

@ -562,7 +562,7 @@ namespace {
}
// Special extra evaluation for bishops
if (Piece == BISHOP)
if (Piece == BISHOP && pos.is_chess960())
{
// An important Chess960 pattern: A cornered bishop blocked by
// a friendly pawn diagonally in front of it is a very serious

2
src/material.cpp
View file

@ -407,7 +407,7 @@ Key EndgameFunctions::buildKey(const string& keyCode) {
}
fen += char(8 - keyCode.length() + '0');
fen += "/8/8/8/8/8/8/8 w - -";
return Position(fen, 0).get_material_key();
return Position(fen, false, 0).get_material_key();
}
const string EndgameFunctions::swapColors(const string& keyCode) {

11
src/position.cpp
View file

@ -152,9 +152,9 @@ Position::Position(const Position& pos, int th) {
nodes = 0;
}
Position::Position(const string& fen, int th) {
Position::Position(const string& fen, bool isChess960, int th) {
from_fen(fen);
from_fen(fen, isChess960);
threadID = th;
}
@ -175,7 +175,7 @@ void Position::detach() {
/// string. This function is not very robust - make sure that input FENs are
/// correct (this is assumed to be the responsibility of the GUI).
void Position::from_fen(const string& fen) {
void Position::from_fen(const string& fen, bool c960) {
/*
A FEN string defines a particular position using only the ASCII character set.
@ -274,10 +274,7 @@ void Position::from_fen(const string& fen) {
castleRightsMask[make_square(initialQRFile, RANK_1)] ^= WHITE_OOO;
castleRightsMask[make_square(initialQRFile, RANK_8)] ^= BLACK_OOO;
isChess960 = initialKFile != FILE_E
|| initialQRFile != FILE_A
|| initialKRFile != FILE_H;
isChess960 = c960;
find_checkers();
st->key = compute_key();

4
src/position.h
View file

@ -134,10 +134,10 @@ public:
// Constructors
Position(const Position& pos, int threadID);
Position(const std::string& fen, int threadID);
Position(const std::string& fen, bool isChess960, int threadID);
// Text input/output
void from_fen(const std::string& fen);
void from_fen(const std::string& fen, bool isChess960);
const std::string to_fen() const;
void print(Move m = MOVE_NONE) const;

8
src/uci.cpp
View file

@ -63,7 +63,7 @@ namespace {
bool execute_uci_command(const string& cmd) {
static Position pos(StartPositionFEN, 0); // The root position
static Position pos(StartPositionFEN, false, 0); // The root position
UCIParser up(cmd);
string token;
@ -84,7 +84,7 @@ bool execute_uci_command(const string& cmd) {
cout << "uciok" << endl;
}
else if (token == "ucinewgame")
pos.from_fen(StartPositionFEN);
pos.from_fen(StartPositionFEN, false);
else if (token == "isready")
cout << "readyok" << endl;
@ -147,7 +147,7 @@ namespace {
if (token == "startpos")
{
pos.from_fen(StartPositionFEN);
pos.from_fen(StartPositionFEN, false);
if (!(up >> token))
return;
}
@ -159,7 +159,7 @@ namespace {
fen += token;
fen += ' ';
}
pos.from_fen(fen);
pos.from_fen(fen, Options["UCI_Chess960"].value<bool>());
}
if (token != "moves")