kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-05-01 01:03:09 +00:00
Code Issues Releases Wiki Activity

Remove unuseful optimization in RKISS

Browse source 
Don't need a struct here. Speed test shows
result is teh same. Moreover RKISS is used
mainly at startup to compute magics, so
prefer to keep it simple...RKISS ;-)

Also some assorted triviality while there.

No functional change.
This commit is contained in:
Marco Costalba 2013-10-13 02:20:35 -07:00
parent b15e148b5e
commit 549b5c478f
3 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/position.cpp
View file

@ -1067,7 +1067,7 @@ int Position::see(Move m, int asymmThreshold) const {
from = from_sq(m); from = from_sq(m);
to = to_sq(m); to = to_sq(m);
swapList[0] = PieceValue[MG][type_of(piece_on(to))]; swapList[0] = PieceValue[MG][piece_on(to)];
stm = color_of(piece_on(from)); stm = color_of(piece_on(from));
occupied = pieces() ^ from; occupied = pieces() ^ from;
@ -1134,7 +1134,7 @@ int Position::see(Move m, int asymmThreshold) const {
// Having built the swap list, we negamax through it to find the best // Having built the swap list, we negamax through it to find the best
// achievable score from the point of view of the side to move. // achievable score from the point of view of the side to move.
while (--slIndex) while (--slIndex)
swapList[slIndex-1] = std::min(-swapList[slIndex], swapList[slIndex-1]); swapList[slIndex - 1] = std::min(-swapList[slIndex], swapList[slIndex - 1]);
return swapList[0]; return swapList[0];
} }

17
src/rkiss.h
View file

@ -43,7 +43,7 @@
class RKISS { class RKISS {
struct S { uint64_t a, b, c, d; } s; // Keep variables always together uint64_t a, b, c, d;
uint64_t rotate(uint64_t x, uint64_t k) const { uint64_t rotate(uint64_t x, uint64_t k) const {
return (x << k) | (x >> (64 - k)); return (x << k) | (x >> (64 - k));
@ -51,19 +51,18 @@ class RKISS {
uint64_t rand64() { uint64_t rand64() {
const uint64_t const uint64_t e = a - rotate(b, 7);
e = s.a - rotate(s.b, 7); a = b ^ rotate(c, 13);
s.a = s.b ^ rotate(s.c, 13); b = c + rotate(d, 37);
s.b = s.c + rotate(s.d, 37); c = d + e;
s.c = s.d + e; return d = e + a;
return s.d = e + s.a;
} }
public: public:
RKISS(int seed = 73) { RKISS(int seed = 73) {
s.a = 0xf1ea5eed; a = 0xF1EA5EED, b = c = d = 0xD4E12C77;
s.b = s.c = s.d = 0xd4e12c77;
for (int i = 0; i < seed; ++i) // Scramble a few rounds for (int i = 0; i < seed; ++i) // Scramble a few rounds
rand64(); rand64();
} }

4
src/types.h
View file

@ -323,11 +323,11 @@ inline bool operator<(const ExtMove& f, const ExtMove& s) {
} }
inline Color operator~(Color c) { inline Color operator~(Color c) {
return Color(c ^ 1); return Color(c ^ BLACK);
} }
inline Square operator~(Square s) { inline Square operator~(Square s) {
return Square(s ^ 56); // Vertical flip SQ_A1 -> SQ_A8 return Square(s ^ SQ_A8); // Vertical flip SQ_A1 -> SQ_A8
} }
inline Square operator|(File f, Rank r) { inline Square operator|(File f, Rank r) {