X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmovepick.h;h=9ffebc0038157c0be17f3094dc4a911e12578115;hb=26dabb1e6bcd8035f0f3516c4358a73f2b041a1c;hp=60a44a6fac71ee3e24b5aab6bb782be7a4ecd287;hpb=99e547f4cb190e462d0c582b731a0fcf25ce1545;p=stockfish
diff --git a/src/movepick.h b/src/movepick.h
index 60a44a6f..9ffebc00 100644
--- a/src/movepick.h
+++ b/src/movepick.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-2013 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2015 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,7 +17,7 @@
along with this program. If not, see .
*/
-#if !defined MOVEPICK_H_INCLUDED
+#ifndef MOVEPICK_H_INCLUDED
#define MOVEPICK_H_INCLUDED
#include // For std::max
@@ -35,32 +35,33 @@
/// and is used for reduction and move ordering decisions. Gains records the move's
/// best evaluation gain from one ply to the next and is used for pruning decisions.
/// Countermoves store the move that refute a previous one. Entries are stored
-/// according only to moving piece and destination square, hence two moves with
+/// using only the moving piece and destination square, hence two moves with
/// different origin but same destination and piece will be considered identical.
template
struct Stats {
- static const Value Max = Value(2000);
+ static const Value Max = Value(250);
- const T* operator[](Piece p) const { return table[p]; }
+ const T* operator[](Piece pc) const { return table[pc]; }
+ T* operator[](Piece pc) { return table[pc]; }
void clear() { std::memset(table, 0, sizeof(table)); }
- void update(Piece p, Square to, Move m) {
+ void update(Piece pc, Square to, Move m) {
- if (m == table[p][to].first)
+ if (m == table[pc][to].first)
return;
- table[p][to].second = table[p][to].first;
- table[p][to].first = m;
+ table[pc][to].second = table[pc][to].first;
+ table[pc][to].first = m;
}
- void update(Piece p, Square to, Value v) {
+ void update(Piece pc, Square to, Value v) {
if (Gain)
- table[p][to] = std::max(v, table[p][to] - 1);
+ table[pc][to] = std::max(v, table[pc][to] - 1);
- else if (abs(table[p][to] + v) < Max)
- table[p][to] += v;
+ else if (abs(table[pc][to] + v) < Max)
+ table[pc][to] += v;
}
private:
@@ -69,7 +70,8 @@ private:
typedef Stats< true, Value> GainsStats;
typedef Stats HistoryStats;
-typedef Stats > CountermovesStats;
+typedef Stats > MovesStats;
+typedef Stats CounterMovesHistoryStats;
/// MovePicker class is used to pick one pseudo legal move at a time from the
@@ -80,31 +82,36 @@ typedef Stats > CountermovesStats;
/// to get a cut-off first.
class MovePicker {
-
- MovePicker& operator=(const MovePicker&); // Silence a warning under MSVC
-
public:
- MovePicker(const Position&, Move, Depth, const HistoryStats&, Square);
- MovePicker(const Position&, Move, const HistoryStats&, PieceType);
- MovePicker(const Position&, Move, Depth, const HistoryStats&, Move*, Search::Stack*, Value);
+ MovePicker(const MovePicker&) = delete;
+ MovePicker& operator=(const MovePicker&) = delete;
+
+ MovePicker(const Position&, Move, Depth, const HistoryStats&, const CounterMovesHistoryStats&, Square);
+ MovePicker(const Position&, Move, const HistoryStats&, const CounterMovesHistoryStats&, PieceType);
+ MovePicker(const Position&, Move, Depth, const HistoryStats&, const CounterMovesHistoryStats&, Move*, Move*, Search::Stack*);
template Move next_move();
private:
template void score();
- void generate_next();
+ void generate_next_stage();
+ ExtMove* begin() { return moves; }
+ ExtMove* end() { return endMoves; }
const Position& pos;
const HistoryStats& history;
+ const CounterMovesHistoryStats& counterMovesHistory;
Search::Stack* ss;
Move* countermoves;
+ Move* followupmoves;
Depth depth;
Move ttMove;
- ExtMove killers[4];
+ ExtMove killers[6];
Square recaptureSquare;
- int captureThreshold, phase;
- ExtMove *cur, *end, *endQuiets, *endBadCaptures;
- ExtMove moves[MAX_MOVES];
+ Value captureThreshold;
+ int stage;
+ ExtMove *endQuiets, *endBadCaptures;
+ ExtMove moves[MAX_MOVES], *cur = moves, *endMoves = moves;
};
-#endif // !defined(MOVEPICK_H_INCLUDED)
+#endif // #ifndef MOVEPICK_H_INCLUDED