X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=src%2Fhistory.cpp;h=949ba316420d8dc5351e412e32f1e23b414b261a;hb=a66f31f1291a3778bf210ab3ef2b7720966655fb;hp=d5632986c5df62ef754329d294d8832d1f4a4691;hpb=d3600c39a745179ed6b094b305d0645e83a1ee86;p=stockfish
diff --git a/src/history.cpp b/src/history.cpp
index d5632986..949ba316 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -1,18 +1,18 @@
/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008 Marco Costalba
+ Copyright (C) 2008-2009 Marco Costalba
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
-
+
Stockfish is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
@@ -23,6 +23,7 @@
////
#include
+#include
#include "history.h"
@@ -31,71 +32,61 @@
//// Functions
////
+
/// Constructor
-History::History() {
- this->clear();
-}
+History::History() { clear(); }
-/// History::clear() clears the history tables.
+/// History::clear() clears the history tables
void History::clear() {
memset(history, 0, 2 * 8 * 64 * sizeof(int));
- memset(successCount, 0, 2 * 8 * 64 * sizeof(int));
- memset(failureCount, 0, 2 * 8 * 64 * sizeof(int));
}
-/// History::success() registers a move as being successful. This is done
+/// History::success() registers a move as being successful. This is done
/// whenever a non-capturing move causes a beta cutoff in the main search.
-/// The three parameters are the moving piece, the move itself, and the
-/// search depth.
+/// The three parameters are the moving piece, the destination square, and
+/// the search depth.
+
+void History::success(Piece p, Square to, Depth d) {
-void History::success(Piece p, Move m, Depth d) {
assert(piece_is_ok(p));
- assert(move_is_ok(m));
+ assert(square_is_ok(to));
- history[p][move_to(m)] += int(d) * int(d);
- successCount[p][move_to(m)]++;
+ history[p][to] += int(d) * int(d);
- // Prevent history overflow:
- if(history[p][move_to(m)] >= HistoryMax)
- for(int i = 0; i < 16; i++)
- for(int j = 0; j < 64; j++)
- history[i][j] /= 2;
+ // Prevent history overflow
+ if (history[p][to] >= HistoryMax)
+ for (int i = 0; i < 16; i++)
+ for (int j = 0; j < 64; j++)
+ history[i][j] /= 4;
}
-/// History::failure() registers a move as being unsuccessful. The function is
+/// History::failure() registers a move as being unsuccessful. The function is
/// called for each non-capturing move which failed to produce a beta cutoff
/// at a node where a beta cutoff was finally found.
-void History::failure(Piece p, Move m) {
+void History::failure(Piece p, Square to, Depth d) {
+
assert(piece_is_ok(p));
- assert(move_is_ok(m));
+ assert(square_is_ok(to));
- failureCount[p][move_to(m)]++;
+ history[p][to] -= int(d) * int(d);
+ if (history[p][to] < 0)
+ history[p][to] = 0;
}
/// 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, Move m) const {
- assert(piece_is_ok(p));
- assert(move_is_ok(m));
-
- return history[p][move_to(m)];
-}
-
-
-/// History::ok_to_prune() decides whether a move has been sufficiently
-/// unsuccessful that it makes sense to prune it entirely.
+int History::move_ordering_score(Piece p, Square to) const {
-bool History::ok_to_prune(Piece p, Move m, Depth d) const {
assert(piece_is_ok(p));
- assert(move_is_ok(m));
+ assert(square_is_ok(to));
- return (int(d) * successCount[p][move_to(m)] < failureCount[p][move_to(m)]);
+ return history[p][to];
}