X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fsearch.h;h=1218ef3be223289f10fbb744d3bab771d1b32fb8;hb=8b15961349e18a9ba113973c53f53913d0cd0fad;hp=121ab8d12446e366bd965619cf23bdb1849e2807;hpb=057d710fc2f23b63b574122f2609e03f58d2e494;p=stockfish

diff --git a/src/search.h b/src/search.h
index 121ab8d1..1218ef3b 100644
--- a/src/search.h
+++ b/src/search.h
@@ -2,7 +2,7 @@
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
   Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
-  Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
+  Copyright (C) 2015-2017 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
 
   Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -38,14 +38,14 @@ namespace Search {
 
 struct Stack {
   Move* pv;
+  CounterMoveStats* counterMoves;
   int ply;
   Move currentMove;
   Move excludedMove;
   Move killers[2];
   Value staticEval;
-  bool skipEarlyPruning;
+  int history;
   int moveCount;
-  CounterMoveStats* counterMoves;
 };
 
 
@@ -57,7 +57,8 @@ struct RootMove {
 
   explicit RootMove(Move m) : pv(1, m) {}
 
-  bool operator<(const RootMove& m) const { return m.score < score; } // Descending sort
+  bool operator<(const RootMove& m) const {
+    return m.score != score ? m.score < score : m.previousScore < previousScore; } // Descending sort
   bool operator==(const Move& m) const { return pv[0] == m; }
   bool extract_ponder_from_tt(Position& pos);