organ
/
Sanmill
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

position: 统一在 do_move() 中递增 gamePly 等值

This commit is contained in:
Calcitem 2020-09-22 23:25:33 +08:00
parent 391e5e1a83
commit efd6b44bdb
1 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/position.cpp
View File

@ -392,8 +392,24 @@ bool Position::pseudo_legal(const Move m) const
void Position::do_move(Move m, StateInfo &newSt) void Position::do_move(Move m, StateInfo &newSt)
{ {
//assert(is_ok(m));
//assert(&newSt != st);
//thisThread->nodes.fetch_add(1, std::memory_order_relaxed); // TODO
#if 0
// Copy some fields of the old state to our new StateInfo object except the
// ones which are going to be recalculated from scratch anyway and then switch
// our state pointer to point to the new (ready to be updated) state.
std::memcpy(&newSt, st, offsetof(StateInfo, key));
newSt.previous = st;
st = &newSt;
#endif
bool ret = false; bool ret = false;
// Increment ply counters. In particular, rule50 will be reset to zero later on
// in case of a capture.
++st->rule50; ++st->rule50;
MoveType mt = type_of(m); MoveType mt = type_of(m);
@ -418,7 +434,30 @@ void Position::do_move(Move m, StateInfo &newSt)
return; return;
} }
++gamePly;
++st->pliesFromNull;
move = m; move = m;
#if 0
// Calculate the repetition info. It is the ply distance from the previous
// occurrence of the same position, negative in the 3-fold case, or zero
// if the position was not repeated.
st->repetition = 0;
int end = std::min(st->rule50, st->pliesFromNull);
if (end >= 4) {
StateInfo *stp = st->previous->previous;
for (int i = 4; i <= end; i += 2) {
stp = stp->previous->previous;
if (stp->key == st->key) {
st->repetition = stp->repetition ? -i : i;
break;
}
}
}
assert(pos_is_ok());
#endif
} }
/// Position::undo_move() unmakes a move. When it returns, the position should /// Position::undo_move() unmakes a move. When it returns, the position should
@ -637,7 +676,6 @@ bool Position::put_piece(Square s, bool updateCmdlist)
if (updateCmdlist) { if (updateCmdlist) {
sprintf(cmdline, "(%1u,%1u)", file_of(s), rank_of(s)); sprintf(cmdline, "(%1u,%1u)", file_of(s), rank_of(s));
gamePly++;
} }
currentSquare = s; currentSquare = s;
@ -700,7 +738,6 @@ bool Position::put_piece(Square s, bool updateCmdlist)
sprintf(cmdline, "(%1u,%1u)->(%1u,%1u)", sprintf(cmdline, "(%1u,%1u)->(%1u,%1u)",
file_of(currentSquare), rank_of(currentSquare), file_of(currentSquare), rank_of(currentSquare),
file_of(s), rank_of(s)); file_of(s), rank_of(s));
gamePly++;
st->rule50++; st->rule50++;
} }
@ -773,7 +810,6 @@ bool Position::remove_piece(Square s, bool updateCmdlist)
if (updateCmdlist) { if (updateCmdlist) {
sprintf(cmdline, "-(%1u,%1u)", file_of(s), rank_of(s)); sprintf(cmdline, "-(%1u,%1u)", file_of(s), rank_of(s));
gamePly++;
st->rule50 = 0; // TODO: Need to move out? st->rule50 = 0; // TODO: Need to move out?
} }