kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-07-11 19:49:14 +00:00
Code Issues Releases Wiki Activity

Use calculate_reduction() function to simplify code

Browse source 
No functional change

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Joona Kiiski 2010-01-27 23:24:01 +02:00 • committed by Marco Costalba
parent 3c7eebb48d
commit 27393ebae2
2 changed files with 21 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/depth.h
View file

@ -48,7 +48,8 @@ inline void operator+= (Depth &d, int i) { d = Depth(int(d) + i); }
inline void operator+= (Depth &d1, Depth d2) { d1 += int(d2); } inline void operator+= (Depth &d1, Depth d2) { d1 += int(d2); }
inline Depth operator- (Depth d, int i) { return Depth(int(d) - i); } inline Depth operator- (Depth d, int i) { return Depth(int(d) - i); }
inline Depth operator- (Depth d1, Depth d2) { return Depth(int(d1) - int(d2)); } inline Depth operator- (Depth d1, Depth d2) { return Depth(int(d1) - int(d2)); }
inline void operator-= (Depth & d, int i) { d = Depth(int(d) - i); } inline void operator-= (Depth &d, int i) { d = Depth(int(d) - i); }
inline void operator-= (Depth &d1, Depth d2) { d1 -= int(d2); }
inline Depth operator* (Depth d, int i) { return Depth(int(d) * i); } inline Depth operator* (Depth d, int i) { return Depth(int(d) * i); }
inline Depth operator* (int i, Depth d) { return Depth(int(d) * i); } inline Depth operator* (int i, Depth d) { return Depth(int(d) * i); }
inline void operator*= (Depth &d, int i) { d = Depth(int(d) * i); } inline void operator*= (Depth &d, int i) { d = Depth(int(d) * i); }

44
src/search.cpp
View file

@ -989,10 +989,9 @@ namespace {
&& !captureOrPromotion && !captureOrPromotion
&& !move_is_castle(move)) && !move_is_castle(move))
{ {
double red = 0.5 + ln(RootMoveNumber - MultiPV + 1) * ln(depth / 2) / 6.0; ss[0].reduction = calculate_reduction(0.5, RootMoveNumber - MultiPV + 1, depth, 6.0);
if (red >= 1.0) if (ss[0].reduction)
{ {
ss[0].reduction = Depth(int(floor(red * int(OnePly))));
value = -search(pos, ss, -alpha, newDepth-ss[0].reduction, 1, true, 0); value = -search(pos, ss, -alpha, newDepth-ss[0].reduction, 1, true, 0);
doFullDepthSearch = (value > alpha); doFullDepthSearch = (value > alpha);
} }
@ -1303,13 +1302,12 @@ namespace {
&& !move_is_castle(move) && !move_is_castle(move)
&& !move_is_killer(move, ss[ply])) && !move_is_killer(move, ss[ply]))
{ {
double red = 0.5 + ln(moveCount) * ln(depth / 2) / 6.0; ss[ply].reduction = calculate_reduction(0.5, moveCount, depth, 6.0);
if (red >= 1.0) if (ss[ply].reduction)
{ {
ss[ply].reduction = Depth(int(floor(red * int(OnePly)))); value = -search(pos, ss, -alpha, newDepth-ss[ply].reduction, ply+1, true, threadID);
value = -search(pos, ss, -alpha, newDepth-ss[ply].reduction, ply+1, true, threadID); doFullDepthSearch = (value > alpha);
doFullDepthSearch = (value > alpha); }
}
} }
if (doFullDepthSearch) // Go with full depth non-pv search if (doFullDepthSearch) // Go with full depth non-pv search
@ -1656,10 +1654,10 @@ namespace {
// Value based pruning // Value based pruning
Depth predictedDepth = newDepth; Depth predictedDepth = newDepth;
//FIXME HACK: awful code duplication //FIXME: We are ignoring condition: depth >= 3*OnePly, BUG??
double red = 0.5 + ln(moveCount) * ln(depth / 2) / 3.0; ss[ply].reduction = calculate_reduction(0.5, moveCount, depth, 3.0);
if (red >= 1.0) if (ss[ply].reduction)
predictedDepth -= int(floor(red * int(OnePly))); predictedDepth -= ss[ply].reduction;
if (predictedDepth < SelectiveDepth) if (predictedDepth < SelectiveDepth)
{ {
@ -1691,13 +1689,11 @@ namespace {
&& !dangerous && !dangerous
&& !captureOrPromotion && !captureOrPromotion
&& !move_is_castle(move) && !move_is_castle(move)
&& !move_is_killer(move, ss[ply]) && !move_is_killer(move, ss[ply]))
/* && move != ttMove*/)
{ {
double red = 0.5 + ln(moveCount) * ln(depth / 2) / 3.0; ss[ply].reduction = calculate_reduction(0.5, moveCount, depth, 3.0);
if (red >= 1.0) if (ss[ply].reduction)
{ {
ss[ply].reduction = Depth(int(floor(red * int(OnePly))));
value = -search(pos, ss, -(beta-1), newDepth-ss[ply].reduction, ply+1, true, threadID); value = -search(pos, ss, -(beta-1), newDepth-ss[ply].reduction, ply+1, true, threadID);
doFullDepthSearch = (value >= beta); doFullDepthSearch = (value >= beta);
} }
@ -2039,10 +2035,9 @@ namespace {
&& !move_is_castle(move) && !move_is_castle(move)
&& !move_is_killer(move, ss[sp->ply])) && !move_is_killer(move, ss[sp->ply]))
{ {
double red = 0.5 + ln(moveCount) * ln(sp->depth / 2) / 3.0; ss[sp->ply].reduction = calculate_reduction(0.5, moveCount, sp->depth, 3.0);
if (red >= 1.0) if (ss[sp->ply].reduction)
{ {
ss[sp->ply].reduction = Depth(int(floor(red * int(OnePly))));
value = -search(pos, ss, -(sp->beta-1), newDepth-ss[sp->ply].reduction, sp->ply+1, true, threadID); value = -search(pos, ss, -(sp->beta-1), newDepth-ss[sp->ply].reduction, sp->ply+1, true, threadID);
doFullDepthSearch = (value >= sp->beta); doFullDepthSearch = (value >= sp->beta);
} }
@ -2153,11 +2148,10 @@ namespace {
&& !move_is_castle(move) && !move_is_castle(move)
&& !move_is_killer(move, ss[sp->ply])) && !move_is_killer(move, ss[sp->ply]))
{ {
double red = 0.5 + ln(moveCount) * ln(sp->depth / 2) / 6.0; ss[sp->ply].reduction = calculate_reduction(0.5, moveCount, sp->depth, 6.0);
if (red >= 1.0) if (ss[sp->ply].reduction)
{ {
Value localAlpha = sp->alpha; Value localAlpha = sp->alpha;
ss[sp->ply].reduction = Depth(int(floor(red * int(OnePly))));
value = -search(pos, ss, -localAlpha, newDepth-ss[sp->ply].reduction, sp->ply+1, true, threadID); value = -search(pos, ss, -localAlpha, newDepth-ss[sp->ply].reduction, sp->ply+1, true, threadID);
doFullDepthSearch = (value > localAlpha); doFullDepthSearch = (value > localAlpha);
} }