/*
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
////
#include "depth.h"
+#include "history.h"
#include "lock.h"
#include "position.h"
struct SearchStack;
/// MovePicker is a class which is used to pick one legal move at a time from
-/// the current position. It is initialized with a Position object and a few
-/// moves we have reason to believe are good. The most important method is
+/// the current position. It is initialized with a Position object and a few
+/// moves we have reason to believe are good. The most important method is
/// MovePicker::pick_next_move(), which returns a new legal move each time it
/// is called, until there are no legal moves left, when MOVE_NONE is returned.
/// In order to improve the efficiency of the alpha beta algorithm, MovePicker
class MovePicker {
- MovePicker& operator=(const MovePicker&); // Silence a warning under MSVC
+ MovePicker& operator=(const MovePicker&); // silence a warning under MSVC
public:
PH_TT_MOVE, // Transposition table move
PH_MATE_KILLER, // Mate killer from the current ply
PH_GOOD_CAPTURES, // Queen promotions and captures with SEE values >= 0
- PH_BAD_CAPTURES, // Queen promotions and captures with SEE values < 0
- PH_KILLER_1, // Killer move 1 from the current ply (not used yet).
- PH_KILLER_2, // Killer move 2 from the current ply (not used yet).
+ PH_KILLERS, // Killer moves from the current ply
PH_NONCAPTURES, // Non-captures and underpromotions
+ PH_BAD_CAPTURES, // Queen promotions and captures with SEE values < 0
PH_EVASIONS, // Check evasions
PH_QCAPTURES, // Captures in quiescence search
- PH_QCHECKS, // Checks in quiescence search
+ PH_QCHECKS, // Non-capture checks in quiescence search
PH_STOP
};
- MovePicker(const Position& p, bool pvnode, Move ttm, const SearchStack& ss, Depth d);
+ MovePicker(const Position& p, Move ttm, Depth d, const History& h, SearchStack* ss = NULL);
Move get_next_move();
- Move get_next_move(Lock &lock);
+ Move get_next_move(Lock& lock);
int number_of_moves() const;
- int current_move_score() const;
Bitboard discovered_check_candidates() const;
static void init_phase_table();
void score_captures();
void score_noncaptures();
void score_evasions();
- void score_qcaptures();
Move pick_move_from_list();
- int find_best_index() const;
const Position& pos;
+ const History& H;
Move ttMove, mateKiller, killer1, killer2;
Bitboard pinned, dc;
MoveStack moves[256], badCaptures[64];
- bool pvNode;
- Depth depth;
int phaseIndex;
int numOfMoves, numOfBadCaptures;
int movesPicked;
+ bool checkKillers, checkLegal;
bool finished;
};
}
/// MovePicker::discovered_check_candidates() returns a bitboard containing
-/// all pieces which can possibly give discovered check. This bitboard is
+/// all pieces which can possibly give discovered check. This bitboard is
/// computed by the constructor function.
inline Bitboard MovePicker::discovered_check_candidates() const {