From: Marco Costalba <mcostalba@gmail.com>
Date: Fri, 29 Mar 2013 21:50:04 +0000 (+0100)
Subject: Merge branch 'master' into increase_iid
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=c89274d8fb25d1c647a13918ccbc568347cb24a4;hp=-c;p=stockfish

Merge branch 'master' into increase_iid
---

c89274d8fb25d1c647a13918ccbc568347cb24a4
diff --combined src/search.cpp
index 8ef2513d,f99f63be..9ab8c800
--- a/src/search.cpp
+++ b/src/search.cpp
@@@ -745,7 -745,7 +745,7 @@@ namespace 
          && ttMove == MOVE_NONE
          && (PvNode || (!inCheck && ss->staticEval + Value(256) >= beta)))
      {
 -        Depth d = (PvNode ? depth - 2 * ONE_PLY : depth / 2);
 +        Depth d = (PvNode ? depth - 2 * ONE_PLY : depth - 4 * ONE_PLY);
  
          ss->skipNullMove = true;
          search<PvNode ? PV : NonPV>(pos, ss, alpha, beta, d);
@@@ -856,7 -856,8 +856,8 @@@ split_point_start: // At split points a
            && !captureOrPromotion
            && !inCheck
            && !dangerous
-           &&  move != ttMove)
+           &&  move != ttMove
+           &&  bestValue > VALUE_MATED_IN_MAX_PLY)
        {
            // Move count based pruning
            if (   depth < 16 * ONE_PLY
@@@ -878,9 -879,14 +879,14 @@@
  
            if (futilityValue < beta)
            {
+               bestValue = std::max(bestValue, futilityValue);
+ 
                if (SpNode)
+               {
                    splitPoint->mutex.lock();
- 
+                   if (bestValue > splitPoint->bestValue)
+                       splitPoint->bestValue = bestValue;
+               }
                continue;
            }