Inline history and gain getters

[stockfish] / src / history.cpp

diff --git a/src/history.cpp b/src/history.cpp
index 2bb3451048d3f6ed5be283e7824232698a29c9ba..6849839ca2305161b24b32e4be106de833126c2f 100644 (file)
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -1,7 +1,7 @@
 /*
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
-  Copyright (C) 2008-2009 Marco Costalba
+  Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, 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
@@ -41,8 +41,8 @@ History::History() { clear(); }
 /// History::clear() clears the history tables
 
 void History::clear() {
-  memset(history, 0, 2 * 8 * 64 * sizeof(int));
-  memset(maxStaticValueDelta, 0, 2 * 8 * 64 * sizeof(int));
+  memset(history, 0, 16 * 64 * sizeof(int));
+  memset(maxStaticValueDelta, 0, 16 * 64 * sizeof(int));
 }
 
 
@@ -85,31 +85,14 @@ void History::failure(Piece p, Square to, Depth d) {
 }
 
 
-/// History::move_ordering_score() returns an integer value used to order the
-/// non-capturing moves in the MovePicker class.
-
-int History::move_ordering_score(Piece p, Square to) const {
-
-  assert(piece_is_ok(p));
-  assert(square_is_ok(to));
-
-  return history[p][to];
-}
-
-
 /// History::set_gain() and History::gain() store and retrieve the
 /// gain of a move given the delta of the static position evaluations
 /// before and after the move.
 
-void History::set_gain(Piece p, Square to, Value delta)
-{
+void History::set_gain(Piece p, Square to, Value delta) {
+
   if (delta >= maxStaticValueDelta[p][to])
       maxStaticValueDelta[p][to] = delta;
   else
       maxStaticValueDelta[p][to]--;
 }
-
-Value History::gain(Piece p, Square to) const
-{
-  return Value(maxStaticValueDelta[p][to]);
-}