X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=src%2Fhistory.h;h=4d84be7054858eb37407b097b87e5aa2320e7846;hb=90e83fa879ccdba066962ad0a9aa5be7c4cd1956;hp=df56307bc389880aee353cbc9aee14e4fba07c13;hpb=436fa5c8fa5302f69a83ad28491702c5dc3d4af7;p=stockfish
diff --git a/src/history.h b/src/history.h
index df56307b..4d84be70 100644
--- 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-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
@@ -17,22 +17,11 @@
along with this program. If not, see .
*/
-
#if !defined(HISTORY_H_INCLUDED)
#define HISTORY_H_INCLUDED
-////
-//// Includes
-////
-
-#include "depth.h"
-#include "move.h"
-#include "piece.h"
-
-
-////
-//// Types
-////
+#include
+#include "types.h"
/// The History class stores statistics about how often different moves
/// have been successful or unsuccessful during the current search. These
@@ -44,37 +33,38 @@
class History {
public:
- History();
void clear();
- void success(Piece p, Square to, Depth d);
- void failure(Piece p, Square to);
- int move_ordering_score(Piece p, Square to) const;
- bool ok_to_prune(Piece p, Square to, Depth d) const;
+ Value value(Piece p, Square to) const;
+ void update(Piece p, Square to, Value bonus);
+ Value gain(Piece p, Square to) const;
+ void update_gain(Piece p, Square to, Value g);
+
+ static const Value MaxValue = Value(2000);
private:
- int history[16][64]; // [piece][square]
- int successCount[16][64];
- int failureCount[16][64];
+ Value history[16][64]; // [piece][to_square]
+ Value maxGains[16][64]; // [piece][to_square]
};
+inline void History::clear() {
+ memset(history, 0, 16 * 64 * sizeof(Value));
+ memset(maxGains, 0, 16 * 64 * sizeof(Value));
+}
-////
-//// Constants and variables
-////
+inline Value History::value(Piece p, Square to) const {
+ return history[p][to];
+}
-/// HistoryMax controls how often the history counters will be scaled down:
-/// When the history score for a move gets bigger than HistoryMax, all
-/// entries in the table are divided by 2. It is difficult to guess what
-/// the ideal value of this constant is. Scaling down the scores often has
-/// the effect that parts of the search tree which have been searched
-/// recently have a bigger importance for move ordering than the moves which
-/// have been searched a long time ago.
-///
-/// Note that HistoryMax should probably be changed whenever the constant
-/// OnePly in depth.h is changed. This is somewhat annoying. Perhaps it
-/// would be better to scale down the history table at regular intervals?
+inline void History::update(Piece p, Square to, Value bonus) {
+ if (abs(history[p][to] + bonus) < MaxValue) history[p][to] += bonus;
+}
-const int HistoryMax = 50000;
+inline Value History::gain(Piece p, Square to) const {
+ return maxGains[p][to];
+}
+inline void History::update_gain(Piece p, Square to, Value g) {
+ maxGains[p][to] = Max(g, maxGains[p][to] - 1);
+}
#endif // !defined(HISTORY_H_INCLUDED)