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

search/position: refactor

This commit is contained in:
Calcitem 2020-10-01 20:10:04 +08:00
parent bb72c31a15
commit 03f66e6f65
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/position.h
View File

@ -239,9 +239,9 @@ public:
/* /*
0x 00 00 0x 00 00
square1 square2 square1 square2
Placing：0x00??，?? is place location Placing:0x00??,?? is place location
Moving：0x__??，__ is from，?? is to Moving:0x__??,__ is from,?? is to
Removing：0xFF??，?? is neg Removing:0xFF??,?? is neg
31 ----- 24 ----- 25 31 ----- 24 ----- 25
| \ | / | | \ | / |
@ -349,8 +349,27 @@ inline bool Position::remove_piece(File f, Rank r)
return ret; return ret;
} }
inline bool Position::undo_move_piece(Square from, Square to)
{
return move_piece(to, from); // TODO
}
inline bool Position::move_piece(Square from, Square to) inline bool Position::move_piece(Square from, Square to)
{ {
#if 0
// index[from] is not updated and becomes stale. This works as long as index[]
// is accessed just by known occupied squares.
Piece pc = board[from];
Bitboard fromTo = from | to;
byTypeBB[ALL_PIECES] ^= fromTo;
byTypeBB[type_of(pc)] ^= fromTo;
byColorBB[color_of(pc)] ^= fromTo;
board[from] = NO_PIECE;
board[to] = pc;
index[to] = index[from];
pieceList[pc][index[to]] = to;
#endif
if (select_piece(from)) { if (select_piece(from)) {
return put_piece(to); return put_piece(to);
} }
@ -358,10 +377,6 @@ inline bool Position::move_piece(Square from, Square to)
return false; return false;
} }
inline bool Position::undo_move_piece(Square from, Square to)
{
return move_piece(to, from); // TODO
}
/// Mill Game /// Mill Game

4
src/search.cpp
View File

@ -46,7 +46,6 @@ LimitsType Limits;
namespace Tablebases namespace Tablebases
{ {
int Cardinality; int Cardinality;
bool RootInTB; bool RootInTB;
bool UseRule50; bool UseRule50;
@ -143,7 +142,6 @@ Value search(Position &pos, Stack *ss, Value alpha, Value beta, Depth depth, boo
template<bool Root> template<bool Root>
uint64_t perft(Position &pos, Depth depth) uint64_t perft(Position &pos, Depth depth)
{ {
StateInfo st; StateInfo st;
uint64_t cnt, nodes = 0; uint64_t cnt, nodes = 0;
const bool leaf = (depth == 2); const bool leaf = (depth == 2);
@ -191,7 +189,6 @@ void Search::clear()
void MainThread::search() void MainThread::search()
{ {
if (Limits.perft) { if (Limits.perft) {
nodes = perft<true>(rootPos, Limits.perft); nodes = perft<true>(rootPos, Limits.perft);
sync_cout << "\nNodes searched: " << nodes << "\n" << sync_endl; sync_cout << "\nNodes searched: " << nodes << "\n" << sync_endl;
@ -291,7 +288,6 @@ void MainThread::search()
void Thread::search() void Thread::search()
{ {
// To allow access to (ss-7) up to (ss+2), the stack must be oversized. // To allow access to (ss-7) up to (ss+2), the stack must be oversized.
// The former is needed to allow update_continuation_histories(ss-1, ...), // The former is needed to allow update_continuation_histories(ss-1, ...),
// which accesses its argument at ss-6, also near the root. // which accesses its argument at ss-6, also near the root.