kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-04-29 16:23:09 +00:00
Code Issues Releases Wiki Activity

MovePicker: use const reference instead of pointers

Browse source 
Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2008-10-16 16:21:36 +02:00
parent 486ec580f9
commit 2943e1ca31
2 changed files with 34 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
src/movepick.cpp
View file

@ -60,15 +60,14 @@ namespace {
/// search captures, promotions and some checks) and about how important good /// search captures, promotions and some checks) and about how important good
/// move ordering is at the current node. /// move ordering is at the current node.
MovePicker::MovePicker(Position &p, bool pvnode, Move ttm, Move mk, MovePicker::MovePicker(const Position& p, bool pvnode, Move ttm, Move mk,
Move k1, Move k2, Depth dpth) { Move k1, Move k2, Depth d) : pos(p) {
pos = &p;
pvNode = pvnode; pvNode = pvnode;
ttMove = ttm; ttMove = ttm;
mateKiller = (mk == ttm)? MOVE_NONE : mk; mateKiller = (mk == ttm)? MOVE_NONE : mk;
killer1 = k1; killer1 = k1;
killer2 = k2; killer2 = k2;
depth = dpth; depth = d;
movesPicked = 0; movesPicked = 0;
numOfMoves = 0; numOfMoves = 0;
numOfBadCaptures = 0; numOfBadCaptures = 0;
@ -116,7 +115,7 @@ Move MovePicker::get_next_move() {
if (ttMove != MOVE_NONE) if (ttMove != MOVE_NONE)
{ {
assert(move_is_ok(ttMove)); assert(move_is_ok(ttMove));
if (generate_move_if_legal(*pos, ttMove, pinned) != MOVE_NONE) if (generate_move_if_legal(pos, ttMove, pinned) != MOVE_NONE)
return ttMove; return ttMove;
} }
break; break;
@ -125,13 +124,13 @@ Move MovePicker::get_next_move() {
if (mateKiller != MOVE_NONE) if (mateKiller != MOVE_NONE)
{ {
assert(move_is_ok(mateKiller)); assert(move_is_ok(mateKiller));
if (generate_move_if_legal(*pos, mateKiller, pinned) != MOVE_NONE) if (generate_move_if_legal(pos, mateKiller, pinned) != MOVE_NONE)
return ttMove; return ttMove;
} }
break; break;
case PH_GOOD_CAPTURES: case PH_GOOD_CAPTURES:
numOfMoves = generate_captures(*pos, moves); numOfMoves = generate_captures(pos, moves);
score_captures(); score_captures();
movesPicked = 0; movesPicked = 0;
break; break;
@ -141,26 +140,26 @@ Move MovePicker::get_next_move() {
break; break;
case PH_NONCAPTURES: case PH_NONCAPTURES:
numOfMoves = generate_noncaptures(*pos, moves); numOfMoves = generate_noncaptures(pos, moves);
score_noncaptures(); score_noncaptures();
movesPicked = 0; movesPicked = 0;
break; break;
case PH_EVASIONS: case PH_EVASIONS:
assert(pos->is_check()); assert(pos.is_check());
numOfMoves = generate_evasions(*pos, moves); numOfMoves = generate_evasions(pos, moves);
score_evasions(); score_evasions();
movesPicked = 0; movesPicked = 0;
break; break;
case PH_QCAPTURES: case PH_QCAPTURES:
numOfMoves = generate_captures(*pos, moves); numOfMoves = generate_captures(pos, moves);
score_qcaptures(); score_qcaptures();
movesPicked = 0; movesPicked = 0;
break; break;
case PH_QCHECKS: case PH_QCHECKS:
numOfMoves = generate_checks(*pos, moves, dc); numOfMoves = generate_checks(pos, moves, dc);
movesPicked = 0; movesPicked = 0;
break; break;
@ -216,12 +215,12 @@ void MovePicker::score_captures() {
for (int i = 0; i < numOfMoves; i++) for (int i = 0; i < numOfMoves; i++)
{ {
Move m = moves[i].move; Move m = moves[i].move;
moves[i].score = pos->see(m); moves[i].score = pos.see(m);
if (moves[i].score >= 0) if (moves[i].score >= 0)
{ {
moves[i].score = move_promotion(m) ? QueenValueMidgame moves[i].score = move_promotion(m) ? QueenValueMidgame
: int(pos->midgame_value_of_piece_on(move_to(m))) : int(pos.midgame_value_of_piece_on(move_to(m)))
-int(pos->type_of_piece_on(move_from(m))); -int(pos.type_of_piece_on(move_from(m)));
// FIXME second term seems wrong ! // FIXME second term seems wrong !
} }
} }
@ -237,13 +236,13 @@ void MovePicker::score_noncaptures() {
else if (m == killer2) else if (m == killer2)
moves[i].score = HistoryMax + 1; moves[i].score = HistoryMax + 1;
else else
moves[i].score = H.move_ordering_score(pos->piece_on(move_from(m)), m); moves[i].score = H.move_ordering_score(pos.piece_on(move_from(m)), m);
// Ensure moves in history are always sorted as first // Ensure moves in history are always sorted as first
if (moves[i].score > 0) if (moves[i].score > 0)
moves[i].score += 1000; moves[i].score += 1000;
moves[i].score += pos->mg_pst_delta(moves[i].move); moves[i].score += pos.mg_pst_delta(moves[i].move);
} }
} }
@ -254,14 +253,14 @@ void MovePicker::score_evasions() {
Move m = moves[i].move; Move m = moves[i].move;
if (m == ttMove) if (m == ttMove)
moves[i].score = 2*HistoryMax; moves[i].score = 2*HistoryMax;
else if (!pos->square_is_empty(move_to(m))) else if (!pos.square_is_empty(move_to(m)))
{ {
moves[i].score = pos->see(m); moves[i].score = pos.see(m);
if (moves[i].score >= 0) if (moves[i].score >= 0)
moves[i].score += HistoryMax; moves[i].score += HistoryMax;
} }
else else
moves[i].score = H.move_ordering_score(pos->piece_on(move_from(m)), m); moves[i].score = H.move_ordering_score(pos.piece_on(move_from(m)), m);
} }
// FIXME try psqt also here // FIXME try psqt also here
} }
@ -273,8 +272,8 @@ void MovePicker::score_qcaptures() {
{ {
Move m = moves[i].move; Move m = moves[i].move;
moves[i].score = move_promotion(m) ? QueenValueMidgame moves[i].score = move_promotion(m) ? QueenValueMidgame
: int(pos->midgame_value_of_piece_on(move_to(m))) : int(pos.midgame_value_of_piece_on(move_to(m)))
-int(pos->midgame_value_of_piece_on(move_to(m))) / 64; -int(pos.midgame_value_of_piece_on(move_to(m))) / 64;
// FIXME Why second term like that ??? // FIXME Why second term like that ???
} }
} }
@ -297,7 +296,7 @@ Move MovePicker::pick_move_from_list() {
switch (PhaseTable[phaseIndex]) { switch (PhaseTable[phaseIndex]) {
case PH_GOOD_CAPTURES: case PH_GOOD_CAPTURES:
assert(!pos->is_check()); assert(!pos.is_check());
assert(movesPicked >= 0); assert(movesPicked >= 0);
while (movesPicked < numOfMoves) while (movesPicked < numOfMoves)
{ {
@ -324,14 +323,14 @@ Move MovePicker::pick_move_from_list() {
moves[bestIndex] = moves[movesPicked++]; moves[bestIndex] = moves[movesPicked++];
if ( move != ttMove if ( move != ttMove
&& move != mateKiller && move != mateKiller
&& pos->move_is_legal(move, pinned)) && pos.move_is_legal(move, pinned))
return move; return move;
} }
} }
break; break;
case PH_NONCAPTURES: case PH_NONCAPTURES:
assert(!pos->is_check()); assert(!pos.is_check());
assert(movesPicked >= 0); assert(movesPicked >= 0);
while (movesPicked < numOfMoves) while (movesPicked < numOfMoves)
{ {
@ -358,14 +357,14 @@ Move MovePicker::pick_move_from_list() {
moves[bestIndex] = moves[movesPicked++]; moves[bestIndex] = moves[movesPicked++];
if ( move != ttMove if ( move != ttMove
&& move != mateKiller && move != mateKiller
&& pos->move_is_legal(move, pinned)) && pos.move_is_legal(move, pinned))
return move; return move;
} }
} }
break; break;
case PH_EVASIONS: case PH_EVASIONS:
assert(pos->is_check()); assert(pos.is_check());
assert(movesPicked >= 0); assert(movesPicked >= 0);
while (movesPicked < numOfMoves) while (movesPicked < numOfMoves)
{ {
@ -388,7 +387,7 @@ Move MovePicker::pick_move_from_list() {
break; break;
case PH_BAD_CAPTURES: case PH_BAD_CAPTURES:
assert(!pos->is_check()); assert(!pos.is_check());
assert(badCapturesPicked >= 0); assert(badCapturesPicked >= 0);
// It's probably a good idea to use SEE move ordering here, instead // It's probably a good idea to use SEE move ordering here, instead
// of just picking the first move. FIXME // of just picking the first move. FIXME
@ -397,13 +396,13 @@ Move MovePicker::pick_move_from_list() {
move = badCaptures[badCapturesPicked++].move; move = badCaptures[badCapturesPicked++].move;
if ( move != ttMove if ( move != ttMove
&& move != mateKiller && move != mateKiller
&& pos->move_is_legal(move, pinned)) && pos.move_is_legal(move, pinned))
return move; return move;
} }
break; break;
case PH_QCAPTURES: case PH_QCAPTURES:
assert(!pos->is_check()); assert(!pos.is_check());
assert(movesPicked >= 0); assert(movesPicked >= 0);
while (movesPicked < numOfMoves) while (movesPicked < numOfMoves)
{ {
@ -427,14 +426,14 @@ Move MovePicker::pick_move_from_list() {
// Remember to change the line below if we decide to hash the qsearch! // Remember to change the line below if we decide to hash the qsearch!
// Maybe also postpone the legality check until after futility pruning? // Maybe also postpone the legality check until after futility pruning?
// FIXME !!! // FIXME !!!
if (/* move != ttMove && */ pos->move_is_legal(move, pinned)) if (/* move != ttMove && */ pos.move_is_legal(move, pinned))
return move; return move;
} }
} }
break; break;
case PH_QCHECKS: case PH_QCHECKS:
assert(!pos->is_check()); assert(!pos.is_check());
assert(movesPicked >= 0); assert(movesPicked >= 0);
// Perhaps we should do something better than just picking the first // Perhaps we should do something better than just picking the first
// move here? FIXME // move here? FIXME
@ -443,7 +442,7 @@ Move MovePicker::pick_move_from_list() {
move = moves[movesPicked++].move; move = moves[movesPicked++].move;
// Remember to change the line below if we decide to hash the qsearch! // Remember to change the line below if we decide to hash the qsearch!
// FIXME !!! // FIXME !!!
if (/* move != ttMove && */ pos->move_is_legal(move, pinned)) if (/* move != ttMove && */ pos.move_is_legal(move, pinned))
return move; return move;
} }
break; break;

5
src/movepick.h
View file

@ -59,8 +59,7 @@ public:
PH_STOP PH_STOP
}; };
MovePicker(Position &p, bool pvnode, Move ttm, Move mk, Move k1, Move k2, MovePicker(const Position& p, bool pvnode, Move ttm, Move mk, Move k1, Move k2, Depth d);
Depth dpth);
Move get_next_move(); Move get_next_move();
Move get_next_move(Lock &lock); Move get_next_move(Lock &lock);
int number_of_moves() const; int number_of_moves() const;
@ -77,7 +76,7 @@ private:
void score_qcaptures(); void score_qcaptures();
Move pick_move_from_list(); Move pick_move_from_list();
Position *pos; const Position& pos;
Move ttMove, mateKiller, killer1, killer2; Move ttMove, mateKiller, killer1, killer2;
Bitboard pinned, dc; Bitboard pinned, dc;
MoveStack moves[256], badCaptures[64]; MoveStack moves[256], badCaptures[64];