Pass endgame value to evaluate_scale_factor()

[stockfish] / src / movepick.h

diff --git a/src/movepick.h b/src/movepick.h
index 46d7626a361311f10e61185153bc314e822a3a32..e703cbc9085888f364a6debc66519c0193fd83a0 100644 (file)
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -57,18 +57,18 @@ struct Stats {
     if (abs(int(v)) >= 324)
         return;
 
-    table[pc][to] -= table[pc][to] * abs(int(v)) / (CM ? 512 : 324);
-    table[pc][to] += int(v) * (CM ? 64 : 32);
+    table[pc][to] -= table[pc][to] * abs(int(v)) / (CM ? 936 : 324);
+    table[pc][to] += int(v) * 32;
   }
 
 private:
   T table[PIECE_NB][SQUARE_NB];
 };
 
-typedef Stats<Move> MovesStats;
+typedef Stats<Move> MoveStats;
 typedef Stats<Value, false> HistoryStats;
-typedef Stats<Value,  true> CounterMovesStats;
-typedef Stats<CounterMovesStats> CounterMovesHistoryStats;
+typedef Stats<Value,  true> CounterMoveStats;
+typedef Stats<CounterMoveStats> CounterMoveHistoryStats;
 
 
 /// MovePicker class is used to pick one pseudo legal move at a time from the
@@ -85,7 +85,7 @@ public:
 
   MovePicker(const Position&, Move, Depth, const HistoryStats&, Square);
   MovePicker(const Position&, Move, const HistoryStats&, Value);
-  MovePicker(const Position&, Move, Depth, const HistoryStats&, const CounterMovesStats&, Move, Search::Stack*);
+  MovePicker(const Position&, Move, Depth, const HistoryStats&, const CounterMoveStats&, Move, Search::Stack*);
 
   Move next_move();
 
@@ -97,7 +97,7 @@ private:
 
   const Position& pos;
   const HistoryStats& history;
-  const CounterMovesStats* counterMovesHistory;
+  const CounterMoveStats* counterMoveHistory;
   Search::Stack* ss;
   Move countermove;
   Depth depth;