#include "movegen.h"
#include "position.h"
-#include "search.h"
#include "types.h"
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 pc, Square to, Move m) {
-
- if (m != table[pc][to])
- table[pc][to] = m;
- }
-
+ void update(Piece pc, Square to, Move m) { table[pc][to] = m; }
void update(Piece pc, Square to, Value v) {
if (abs(int(v)) >= 324)
return;
- table[pc][to] -= table[pc][to] * abs(int(v)) / (CM ? 512 : 324);
- table[pc][to] += int(v) * (CM ? 64 : 32);
+ table[pc][to] -= table[pc][to] * abs(int(v)) / (CM ? 936 : 324);
+ table[pc][to] += int(v) * 32;
}
private:
typedef Stats<Value, true> CounterMoveStats;
typedef Stats<CounterMoveStats> CounterMoveHistoryStats;
+struct FromToStats {
+
+ Value get(Color c, Move m) const { return table[c][from_sq(m)][to_sq(m)]; }
+ void clear() { std::memset(table, 0, sizeof(table)); }
+ void update(Color c, Move m, Value v) {
+
+ if (abs(int(v)) >= 324)
+ return;
+
+ Square from = from_sq(m);
+ Square to = to_sq(m);
+
+ table[c][from][to] -= table[c][from][to] * abs(int(v)) / 324;
+ table[c][from][to] += int(v) * 32;
+ }
+
+private:
+ Value table[COLOR_NB][SQUARE_NB][SQUARE_NB];
+};
+
/// MovePicker class is used to pick one pseudo legal move at a time from the
/// current position. The most important method is next_move(), which returns a
/// when MOVE_NONE is returned. In order to improve the efficiency of the alpha
/// beta algorithm, MovePicker attempts to return the moves which are most likely
/// to get a cut-off first.
+namespace Search { struct Stack; }
class MovePicker {
public:
MovePicker(const MovePicker&) = delete;
MovePicker& operator=(const MovePicker&) = delete;
- MovePicker(const Position&, Move, Depth, const HistoryStats&, Square);
- MovePicker(const Position&, Move, const HistoryStats&, Value);
- MovePicker(const Position&, Move, Depth, const HistoryStats&, const CounterMoveStats&, Move, Search::Stack*);
+ MovePicker(const Position&, Move, Value);
+ MovePicker(const Position&, Move, Depth, Square);
+ MovePicker(const Position&, Move, Depth, Search::Stack*);
Move next_move();
private:
template<GenType> void score();
- void generate_next_stage();
- ExtMove* begin() { return moves; }
+ ExtMove* begin() { return cur; }
ExtMove* end() { return endMoves; }
const Position& pos;
- const HistoryStats& history;
- const CounterMoveStats* counterMoveHistory;
- Search::Stack* ss;
+ const Search::Stack* ss;
Move countermove;
Depth depth;
Move ttMove;
- ExtMove killers[3];
Square recaptureSquare;
Value threshold;
int stage;
- ExtMove *endQuiets, *endBadCaptures = moves + MAX_MOVES - 1;
- ExtMove moves[MAX_MOVES], *cur = moves, *endMoves = moves;
+ ExtMove *cur, *endMoves, *endBadCaptures;
+ ExtMove moves[MAX_MOVES];
};
#endif // #ifndef MOVEPICK_H_INCLUDED