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

MovePicker::score() 中不再使用 them 成员变量 

并且将 pos 直接访问成员变量改为通过函数
This commit is contained in:
Calcitem 2020-09-29 18:58:21 +08:00
parent 051085beb9
commit 4e50c2deca
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/movepick.cpp
View File

@ -67,10 +67,10 @@ void MovePicker::score()
Square sqsrc = from_sq(m); Square sqsrc = from_sq(m);
// if stat before moving, moving phrase maybe from @-0-@ to 0-@-@, but no mill, so need sqsrc to judge // if stat before moving, moving phrase maybe from @-0-@ to 0-@-@, but no mill, so need sqsrc to judge
int nOurMills = pos.in_how_many_mills(sq, pos.sideToMove, sqsrc); int nOurMills = pos.in_how_many_mills(sq, pos.side_to_move(), sqsrc);
int nTheirMills = 0; int nTheirMills = 0;
#ifndef SORT_MOVE_WITHOUT_HUMAN_KNOWLEDGES #ifndef SORT_MOVE_WITHOUT_HUMAN_KNOWLEDGES
// TODO: rule.allowRemoveMultiPiecesWhenCloseMultiMill adapt other rules // TODO: rule.allowRemoveMultiPiecesWhenCloseMultiMill adapt other rules
if (type_of(m) != MOVETYPE_REMOVE) { if (type_of(m) != MOVETYPE_REMOVE) {
// all phrase, check if place sq can close mill // all phrase, check if place sq can close mill
@ -78,13 +78,13 @@ void MovePicker::score()
cur->value += RATING_ONE_MILL * nOurMills; cur->value += RATING_ONE_MILL * nOurMills;
} else if (pos.get_phase() == PHASE_PLACING) { } else if (pos.get_phase() == PHASE_PLACING) {
// placing phrase, check if place sq can block their close mill // placing phrase, check if place sq can block their close mill
nTheirMills = pos.in_how_many_mills(sq, pos.them); nTheirMills = pos.in_how_many_mills(sq, ~pos.side_to_move());
cur->value += RATING_BLOCK_ONE_MILL * nTheirMills; cur->value += RATING_BLOCK_ONE_MILL * nTheirMills;
} }
#if 1 #if 1
else if (pos.get_phase() == PHASE_MOVING) { else if (pos.get_phase() == PHASE_MOVING) {
// moving phrase, check if place sq can block their close mill // moving phrase, check if place sq can block their close mill
nTheirMills = pos.in_how_many_mills(sq, pos.them); nTheirMills = pos.in_how_many_mills(sq, ~pos.side_to_move());
if (nTheirMills) { if (nTheirMills) {
int nOurPieces = 0; int nOurPieces = 0;
@ -101,7 +101,7 @@ void MovePicker::score()
} }
} }
} }
#endif #endif
//cur->value += nBanned; // placing phrase, place nearby ban point //cur->value += nBanned; // placing phrase, place nearby ban point
@ -119,7 +119,7 @@ void MovePicker::score()
pos.surrounded_pieces_count(sq, nOurPieces, nTheirPieces, nBanned, nEmpty); pos.surrounded_pieces_count(sq, nOurPieces, nTheirPieces, nBanned, nEmpty);
if (nOurMills > 0) { if (nOurMills > 0) {
// remove point is in our mill // remove point is in our mill
//cur->value += RATING_REMOVE_ONE_MILL * nOurMills; //cur->value += RATING_REMOVE_ONE_MILL * nOurMills;
@ -134,7 +134,7 @@ void MovePicker::score()
} }
// remove point is in their mill // remove point is in their mill
nTheirMills = pos.in_how_many_mills(sq, pos.them); nTheirMills = pos.in_how_many_mills(sq, ~pos.side_to_move());
if (nTheirMills) { if (nTheirMills) {
if (nTheirPieces >= 2) { if (nTheirPieces >= 2) {
// if nearby their piece, prefer do not remove // if nearby their piece, prefer do not remove
@ -150,8 +150,8 @@ void MovePicker::score()
// prefer remove piece that mobility is strong // prefer remove piece that mobility is strong
cur->value += nEmpty; cur->value += nEmpty;
} }
#endif // !SORT_MOVE_WITHOUT_HUMAN_KNOWLEDGES #endif // !SORT_MOVE_WITHOUT_HUMAN_KNOWLEDGES
} }
} }
/// MovePicker::select() returns the next move satisfying a predicate function. /// MovePicker::select() returns the next move satisfying a predicate function.