X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsquare.h;h=621e398fb19069180f141df29423c4af171de2b6;hp=4f024c961df33b8c3c40caed7617b1b14196ccf9;hb=6080fecf9cba9ac063f8f07bd25004c14016bd33;hpb=cc769514837494e2690fffa487a86377c5bb6d50 diff --git a/src/square.h b/src/square.h index 4f024c96..621e398f 100644 --- a/src/square.h +++ b/src/square.h @@ -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-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 @@ -57,55 +57,55 @@ enum Rank { }; enum SquareDelta { - DELTA_SSW = -021, DELTA_SS = -020, DELTA_SSE = -017, DELTA_SWW = -012, - DELTA_SW = -011, DELTA_S = -010, DELTA_SE = -07, DELTA_SEE = -06, - DELTA_W = -01, DELTA_ZERO = 0, DELTA_E = 01, DELTA_NWW = 06, DELTA_NW = 07, - DELTA_N = 010, DELTA_NE = 011, DELTA_NEE = 012, DELTA_NNW = 017, - DELTA_NN = 020, DELTA_NNE = 021 + + DELTA_N = 8, DELTA_E = 1, DELTA_S = -8, DELTA_W = -1, + + DELTA_NN = DELTA_N + DELTA_N, + DELTA_NE = DELTA_N + DELTA_E, + DELTA_SE = DELTA_S + DELTA_E, + DELTA_SS = DELTA_S + DELTA_S, + DELTA_SW = DELTA_S + DELTA_W, + DELTA_NW = DELTA_N + DELTA_W, +}; + +enum Direction { + DIR_E = 0, DIR_N = 1, DIR_NE = 2, DIR_NW = 3, DIR_NONE = 4 +}; + +enum SignedDirection { + SIGNED_DIR_E = 0, SIGNED_DIR_W = 1, + SIGNED_DIR_N = 2, SIGNED_DIR_S = 3, + SIGNED_DIR_NE = 4, SIGNED_DIR_SW = 5, + SIGNED_DIR_NW = 6, SIGNED_DIR_SE = 7, + SIGNED_DIR_NONE = 8 }; +ENABLE_OPERATORS_ON(Square); +ENABLE_OPERATORS_ON(File); +ENABLE_OPERATORS_ON(Rank); +ENABLE_OPERATORS_ON(SquareDelta); +ENABLE_OPERATORS_ON(SignedDirection); + //// //// Constants //// -const int FlipMask = 070; -const int FlopMask = 07; +const int FlipMask = 56; +const int FlopMask = 7; + +extern uint8_t DirectionTable[64][64]; +extern uint8_t SignedDirectionTable[64][64]; //// //// Inline functions //// -inline File operator+ (File x, int i) { return File(int(x) + i); } -inline File operator+ (File x, File y) { return x + int(y); } -inline void operator++ (File &x, int) { x = File(int(x) + 1); } -inline void operator+= (File &x, int i) { x = File(int(x) + i); } -inline File operator- (File x, int i) { return File(int(x) - i); } -inline void operator-- (File &x, int) { x = File(int(x) - 1); } -inline void operator-= (File &x, int i) { x = File(int(x) - i); } - -inline Rank operator+ (Rank x, int i) { return Rank(int(x) + i); } -inline Rank operator+ (Rank x, Rank y) { return x + int(y); } -inline void operator++ (Rank &x, int) { x = Rank(int(x) + 1); } -inline void operator+= (Rank &x, int i) { x = Rank(int(x) + i); } -inline Rank operator- (Rank x, int i) { return Rank(int(x) - i); } -inline void operator-- (Rank &x, int) { x = Rank(int(x) - 1); } -inline void operator-= (Rank &x, int i) { x = Rank(int(x) - i); } - -inline Square operator+ (Square x, int i) { return Square(int(x) + i); } -inline void operator++ (Square &x, int) { x = Square(int(x) + 1); } -inline void operator+= (Square &x, int i) { x = Square(int(x) + i); } -inline Square operator- (Square x, int i) { return Square(int(x) - i); } -inline void operator-- (Square &x, int) { x = Square(int(x) - 1); } -inline void operator-= (Square &x, int i) { x = Square(int(x) - i); } -inline Square operator+ (Square x, SquareDelta i) { return Square(int(x) + i); } -inline void operator+= (Square &x, SquareDelta i) { x = Square(int(x) + i); } -inline Square operator- (Square x, SquareDelta i) { return Square(int(x) - i); } -inline void operator-= (Square &x, SquareDelta i) { x = Square(int(x) - i); } -inline SquareDelta operator- (Square x, Square y) { - return SquareDelta(int(x) - int(y)); -} +inline Square operator+ (Square x, SquareDelta i) { return x + Square(i); } +inline void operator+= (Square& x, SquareDelta i) { x = x + Square(i); } +inline Square operator- (Square x, SquareDelta i) { return x - Square(i); } +inline void operator-= (Square& x, SquareDelta i) { x = x - Square(i); } inline Square make_square(File f, Rank r) { return Square(int(f) | (int(r) << 3)); @@ -135,8 +135,13 @@ inline Rank relative_rank(Color c, Square s) { return square_rank(relative_square(c, s)); } -inline Color square_color(Square s) { - return Color((int(square_file(s)) + int(square_rank(s))) & 1); +inline SquareColor square_color(Square s) { + return SquareColor((int(square_file(s)) + int(square_rank(s))) & 1); +} + +inline bool same_color_squares(Square s1, Square s2) { + int s = int(s1) ^ int(s2); + return (((s >> 3) ^ s) & 1) == 0; } inline int file_distance(File f1, File f2) { @@ -164,7 +169,7 @@ inline File file_from_char(char c) { } inline char file_to_char(File f) { - return char(f - FILE_A) + 'a'; + return char(f - FILE_A + int('a')); } inline Rank rank_from_char(char c) { @@ -172,18 +177,12 @@ inline Rank rank_from_char(char c) { } inline char rank_to_char(Rank r) { - return char(r - RANK_1) + '1'; -} - -inline Square square_from_string(const std::string& str) { - return make_square(file_from_char(str[0]), rank_from_char(str[1])); + return char(r - RANK_1 + int('1')); } inline const std::string square_to_string(Square s) { - std::string str; - str += file_to_char(square_file(s)); - str += rank_to_char(square_rank(s)); - return str; + return std::string(1, file_to_char(square_file(s))) + + std::string(1, rank_to_char(square_rank(s))); } inline bool file_is_ok(File f) { @@ -198,4 +197,22 @@ inline bool square_is_ok(Square s) { return file_is_ok(square_file(s)) && rank_is_ok(square_rank(s)); } +inline Direction direction_between_squares(Square s1, Square s2) { + return Direction(DirectionTable[s1][s2]); +} + +inline int direction_is_diagonal(Square s1, Square s2) { + return DirectionTable[s1][s2] & 2; +} + +inline bool direction_is_straight(Square s1, Square s2) { + return DirectionTable[s1][s2] < 2; +} + +//// +//// Prototypes +//// + +extern void init_direction_table(); + #endif // !defined(SQUARE_H_INCLUDED)