Revert NULL move beta corrections

[stockfish] / src / evaluate.cpp

diff --git a/src/evaluate.cpp b/src/evaluate.cpp
index 4745da0210a921112852c3a3cb69192200660481..c397671cb408d53293b76967260b2d292591f6f1 100644 (file)
--- a/src/evaluate.cpp
+++ b/src/evaluate.cpp
@@ -289,6 +289,7 @@ namespace {
 
   void evaluate_space(const Position &p, Color us, EvalInfo &ei);
   inline Value apply_weight(Value v, int w);
+  Value scale_by_game_phase(Value mv, Value ev, Phase ph, const ScaleFactor sf[]);
 
   int count_1s_8bit(Bitboard b);
 
@@ -527,22 +528,6 @@ void read_weights(Color us) {
 }
 
 
-/// scale_by_game_phase() interpolates between a middle game and an endgame
-/// score, based on game phase.  It also scales the return value by a
-/// ScaleFactor array.
-
-Value scale_by_game_phase(Value mv, Value ev, Phase ph, const ScaleFactor sf[]) {
-
-  assert(mv > -VALUE_INFINITE && mv < VALUE_INFINITE);
-  assert(ev > -VALUE_INFINITE && ev < VALUE_INFINITE);
-  assert(ph >= PHASE_ENDGAME && ph <= PHASE_MIDGAME);
-
-  ev = apply_scale_factor(ev, sf[(ev > Value(0) ? WHITE : BLACK)]);
-
-  Value result = Value(int((mv * ph + ev * (128 - ph)) / 128));
-  return Value(int(result) & ~(GrainSize - 1));
-}
-
 namespace {
 
   // evaluate_common() computes terms common to all pieces attack
@@ -1159,6 +1144,23 @@ namespace {
   }
 
 
+  // scale_by_game_phase() interpolates between a middle game and an endgame
+  // score, based on game phase.  It also scales the return value by a
+  // ScaleFactor array.
+
+  Value scale_by_game_phase(Value mv, Value ev, Phase ph, const ScaleFactor sf[]) {
+
+    assert(mv > -VALUE_INFINITE && mv < VALUE_INFINITE);
+    assert(ev > -VALUE_INFINITE && ev < VALUE_INFINITE);
+    assert(ph >= PHASE_ENDGAME && ph <= PHASE_MIDGAME);
+
+    ev = apply_scale_factor(ev, sf[(ev > Value(0) ? WHITE : BLACK)]);
+
+    Value result = Value(int((mv * ph + ev * (128 - ph)) / 128));
+    return Value(int(result) & ~(GrainSize - 1));
+  }
+
+
   // count_1s_8bit() counts the number of nonzero bits in the 8 least
   // significant bits of a Bitboard. This function is used by the king
   // shield evaluation.