Reformat previous patch

[stockfish] / src / search.cpp

diff --git a/src/search.cpp b/src/search.cpp
index 9d3734b89365c670415c0a9f8070526ea1e4bc90..40561544ab00a872947d6fef00db1364de71dfaf 100644 (file)
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -88,7 +88,7 @@ namespace {
   Value DrawValue[COLOR_NB];
   History Hist;
   Gains Gain;
   Value DrawValue[COLOR_NB];
   History Hist;
   Gains Gain;

-  RefutationTable Refutation;
+  Refutations Refutation;

 
   template <NodeType NT>
   Value search(Position& pos, Stack* ss, Value alpha, Value beta, Depth depth);
 
   template <NodeType NT>
   Value search(Position& pos, Stack* ss, Value alpha, Value beta, Depth depth);


@@ -766,12 +766,7 @@ namespace {
 
 split_point_start: // At split points actual search starts from here
 
 
 split_point_start: // At split points actual search starts from here
 

-    Move prevMove = (ss-1)->currentMove;
-    Square prevSq = to_sq(prevMove);
-    Piece  prevP  = pos.piece_on(prevSq);
-    Move refutationMove = Refutation.get(prevP, prevSq); 
-
-    MovePicker mp(pos, ttMove, depth, Hist, ss, refutationMove, PvNode ? -VALUE_INFINITE : beta);
+    MovePicker mp(pos, ttMove, depth, Hist, Refutation, ss, PvNode ? -VALUE_INFINITE : beta);

     CheckInfo ci(pos);
     value = bestValue; // Workaround a bogus 'uninitialized' warning under gcc
     singularExtensionNode =   !RootNode
     CheckInfo ci(pos);
     value = bestValue; // Workaround a bogus 'uninitialized' warning under gcc
     singularExtensionNode =   !RootNode


@@ -1097,7 +1092,8 @@ split_point_start: // At split points actual search starts from here
             // Increase history value of the cut-off move
             Value bonus = Value(int(depth) * int(depth));
             Hist.update(pos.piece_moved(bestMove), to_sq(bestMove), bonus);
             // Increase history value of the cut-off move
             Value bonus = Value(int(depth) * int(depth));
             Hist.update(pos.piece_moved(bestMove), to_sq(bestMove), bonus);

-            Refutation.update(prevP, prevSq, bestMove);
+            Square prevSq = to_sq((ss-1)->currentMove);
+            Refutation.update(pos.piece_on(prevSq), prevSq, bestMove);

 
             // Decrease history of all the other played non-capture moves
             for (int i = 0; i < playedMoveCount - 1; i++)
 
             // Decrease history of all the other played non-capture moves
             for (int i = 0; i < playedMoveCount - 1; i++)