summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
3c7eebb)
No functional change
Signed-off-by: Marco Costalba <mcostalba@gmail.com>
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 d1, Depth d2) { return Depth(int(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 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* (int i, Depth d) { return Depth(int(d) * i); }
inline void operator*= (Depth &d, int i) { d = 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 void operator*= (Depth &d, int i) { d = Depth(int(d) * i); }
&& !captureOrPromotion
&& !move_is_castle(move))
{
&& !captureOrPromotion
&& !move_is_castle(move))
{
- double red = 0.5 + ln(RootMoveNumber - MultiPV + 1) * ln(depth / 2) / 6.0;
- if (red >= 1.0)
+ ss[0].reduction = calculate_reduction(0.5, RootMoveNumber - MultiPV + 1, depth, 6.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);
doFullDepthSearch = (value > alpha);
}
value = -search(pos, ss, -alpha, newDepth-ss[0].reduction, 1, true, 0);
doFullDepthSearch = (value > alpha);
}
&& !move_is_castle(move)
&& !move_is_killer(move, ss[ply]))
{
&& !move_is_castle(move)
&& !move_is_killer(move, ss[ply]))
{
- double red = 0.5 + ln(moveCount) * ln(depth / 2) / 6.0;
- if (red >= 1.0)
- {
- ss[ply].reduction = Depth(int(floor(red * int(OnePly))));
- value = -search(pos, ss, -alpha, newDepth-ss[ply].reduction, ply+1, true, threadID);
- doFullDepthSearch = (value > alpha);
- }
+ ss[ply].reduction = calculate_reduction(0.5, moveCount, depth, 6.0);
+ if (ss[ply].reduction)
+ {
+ value = -search(pos, ss, -alpha, newDepth-ss[ply].reduction, ply+1, true, threadID);
+ doFullDepthSearch = (value > alpha);
+ }
}
if (doFullDepthSearch) // Go with full depth non-pv search
}
if (doFullDepthSearch) // Go with full depth non-pv search
// Value based pruning
Depth predictedDepth = newDepth;
// Value based pruning
Depth predictedDepth = newDepth;
- //FIXME HACK: awful code duplication
- double red = 0.5 + ln(moveCount) * ln(depth / 2) / 3.0;
- if (red >= 1.0)
- predictedDepth -= int(floor(red * int(OnePly)));
+ //FIXME: We are ignoring condition: depth >= 3*OnePly, BUG??
+ ss[ply].reduction = calculate_reduction(0.5, moveCount, depth, 3.0);
+ if (ss[ply].reduction)
+ predictedDepth -= ss[ply].reduction;
if (predictedDepth < SelectiveDepth)
{
if (predictedDepth < SelectiveDepth)
{
&& !dangerous
&& !captureOrPromotion
&& !move_is_castle(move)
&& !dangerous
&& !captureOrPromotion
&& !move_is_castle(move)
- && !move_is_killer(move, ss[ply])
- /* && move != ttMove*/)
+ && !move_is_killer(move, ss[ply]))
- double red = 0.5 + ln(moveCount) * ln(depth / 2) / 3.0;
- if (red >= 1.0)
+ ss[ply].reduction = calculate_reduction(0.5, moveCount, depth, 3.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);
doFullDepthSearch = (value >= beta);
}
value = -search(pos, ss, -(beta-1), newDepth-ss[ply].reduction, ply+1, true, threadID);
doFullDepthSearch = (value >= beta);
}
&& !move_is_castle(move)
&& !move_is_killer(move, ss[sp->ply]))
{
&& !move_is_castle(move)
&& !move_is_killer(move, ss[sp->ply]))
{
- double red = 0.5 + ln(moveCount) * ln(sp->depth / 2) / 3.0;
- if (red >= 1.0)
+ ss[sp->ply].reduction = calculate_reduction(0.5, moveCount, sp->depth, 3.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);
doFullDepthSearch = (value >= sp->beta);
}
value = -search(pos, ss, -(sp->beta-1), newDepth-ss[sp->ply].reduction, sp->ply+1, true, threadID);
doFullDepthSearch = (value >= sp->beta);
}
&& !move_is_castle(move)
&& !move_is_killer(move, ss[sp->ply]))
{
&& !move_is_castle(move)
&& !move_is_killer(move, ss[sp->ply]))
{
- double red = 0.5 + ln(moveCount) * ln(sp->depth / 2) / 6.0;
- if (red >= 1.0)
+ ss[sp->ply].reduction = calculate_reduction(0.5, moveCount, sp->depth, 6.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);
doFullDepthSearch = (value > localAlpha);
}
value = -search(pos, ss, -localAlpha, newDepth-ss[sp->ply].reduction, sp->ply+1, true, threadID);
doFullDepthSearch = (value > localAlpha);
}