Use self-describing constants instead of numbers

[stockfish] / src / history.h

diff --git a/src/history.h b/src/history.h
index c01893321dd63a33cd9aa4abfa0e1804caa7de2e..c5f72f22afb6fed41da0d5b6ad694fe2d17cabda 100644 (file)
--- a/src/history.h
+++ b/src/history.h
@@ -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-2010 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2008-2012 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
@@ -20,13 +20,10 @@
 #if !defined(HISTORY_H_INCLUDED)
 #define HISTORY_H_INCLUDED
 
+#include <algorithm>
 #include <cstring>
 
-#include "depth.h"
-#include "piece.h"
-#include "square.h"
-#include "value.h"
-
+#include "types.h"
 
 /// The History class stores statistics about how often different moves
 /// have been successful or unsuccessful during the current search. These
@@ -38,18 +35,17 @@
 class History {
 
 public:
-  History() { clear(); }
   void clear();
   Value value(Piece p, Square to) const;
-  void update(Piece p, Square to, Value bonus);
+  void add(Piece p, Square to, Value bonus);
   Value gain(Piece p, Square to) const;
-  void update_gain(Piece p, Square to, Value gain);
+  void update_gain(Piece p, Square to, Value g);
 
-  static const Value MaxValue = Value(1 << 29); // To avoid an overflow
+  static const Value MaxValue = Value(2000);
 
 private:
-  Value history[16][64];  // [piece][to_square]
-  Value maxGains[16][64]; // [piece][to_square]
+  Value history[PIECE_NB][SQUARE_NB];
+  Value maxGains[PIECE_NB][SQUARE_NB];
 };
 
 inline void History::clear() {
@@ -61,16 +57,16 @@ inline Value History::value(Piece p, Square to) const {
   return history[p][to];
 }
 
-inline void History::update(Piece p, Square to, Value bonus) {
-  if (abs(history[p][to]) < MaxValue) history[p][to] += bonus;
+inline void History::add(Piece p, Square to, Value bonus) {
+  if (abs(history[p][to] + bonus) < MaxValue) history[p][to] += bonus;
 }
 
 inline Value History::gain(Piece p, Square to) const {
   return maxGains[p][to];
 }
 
-inline void History::update_gain(Piece p, Square to, Value gain) {
-  maxGains[p][to] = Max(gain, maxGains[p][to] - 1);
+inline void History::update_gain(Piece p, Square to, Value g) {
+  maxGains[p][to] = std::max(g, maxGains[p][to] - 1);
 }
 
 #endif // !defined(HISTORY_H_INCLUDED)