X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmovepick.h;h=c512d130e497dfa9bb54146371ad7a97e049ce5f;hb=82d065b011e416d655167864e4939ce84f0521e5;hp=572025f20e0edb936f8dba3b7df4eb74dc2013cf;hpb=4064ee540649cb46ad4cc4a6080bd4ef41314cb9;p=stockfish
diff --git a/src/movepick.h b/src/movepick.h
index 572025f2..c512d130 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-2014 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,32 @@
/// 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);
- const T* operator[](Piece p) const { return table[p]; }
+ const T* operator[](Piece pc) const { 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 +69,7 @@ private:
typedef Stats< true, Value> GainsStats;
typedef Stats HistoryStats;
-typedef Stats > CountermovesStats;
+typedef Stats > MovesStats;
/// MovePicker class is used to pick one pseudo legal move at a time from the
@@ -86,25 +86,27 @@ class MovePicker {
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*);
+ MovePicker(const Position&, Move, Depth, const HistoryStats&, Move*, Move*, Search::Stack*);
template Move next_move();
private:
template void score();
- void generate_next();
+ void generate_next_stage();
const Position& pos;
const HistoryStats& history;
Search::Stack* ss;
Move* countermoves;
+ Move* followupmoves;
Depth depth;
Move ttMove;
- ExtMove killers[4];
+ ExtMove killers[6];
Square recaptureSquare;
- int captureThreshold, stage;
+ Value captureThreshold;
+ int stage;
ExtMove *cur, *end, *endQuiets, *endBadCaptures;
ExtMove moves[MAX_MOVES];
};
-#endif // !defined(MOVEPICK_H_INCLUDED)
+#endif // #ifndef MOVEPICK_H_INCLUDED