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

Fix build warnings

This commit is contained in:
Calcitem 2020-03-20 22:31:46 +08:00
parent 2f5380f58a
commit d47be83ae5
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ai/movegen.cpp
View File

@ -114,16 +114,16 @@ int StateInfo::generateMoves(Stack<move_t, MOVE_COUNT> &moves)
// 对于原有位置，遍历四个方向的着法，如果棋盘上为空位就加到结点列表中 // 对于原有位置，遍历四个方向的着法，如果棋盘上为空位就加到结点列表中
newSquare = static_cast<square_t>(MoveList::moveTable[oldSquare][direction]); newSquare = static_cast<square_t>(MoveList::moveTable[oldSquare][direction]);
if (newSquare && !boardLocations[newSquare]) { if (newSquare && !boardLocations[newSquare]) {
move_t move = move_t((oldSquare << 8) + newSquare); move_t m = move_t((oldSquare << 8) + newSquare);
moves.push_back((move_t)move); moves.push_back((move_t)m);
} }
} }
} else { } else {
// 对于棋盘上还有不到3个字，但允许飞子的情况，不要求在着法表中，是空位就行 // 对于棋盘上还有不到3个字，但允许飞子的情况，不要求在着法表中，是空位就行
for (newSquare = SQ_BEGIN; newSquare < SQ_END; newSquare = static_cast<square_t>(newSquare + 1)) { for (newSquare = SQ_BEGIN; newSquare < SQ_END; newSquare = static_cast<square_t>(newSquare + 1)) {
if (!boardLocations[newSquare]) { if (!boardLocations[newSquare]) {
move_t move = move_t((oldSquare << 8) + newSquare); move_t m = move_t((oldSquare << 8) + newSquare);
moves.push_back((move_t)move); moves.push_back((move_t)m);
} }
} }
} }

16
src/ai/search.cpp
View File

@ -197,7 +197,7 @@ void AIAlgorithm::buildRoot()
} }
Node *Node::addChild( Node *Node::addChild(
const move_t &move, const move_t &m,
AIAlgorithm *ai, AIAlgorithm *ai,
StateInfo *st StateInfo *st
#ifdef BEST_MOVE_ENABLE #ifdef BEST_MOVE_ENABLE
@ -214,7 +214,7 @@ Node *Node::addChild(
return nullptr; return nullptr;
} }
newNode->move = move; newNode->move = m;
#ifdef ALPHABETA_AI #ifdef ALPHABETA_AI
newNode->value = VALUE_ZERO; newNode->value = VALUE_ZERO;
@ -288,12 +288,12 @@ Node *Node::addChild(
// 若没有启用置换表，或启用了但为叶子节点，则 bestMove 为0 // 若没有启用置换表，或启用了但为叶子节点，则 bestMove 为0
square_t sq = SQ_0; square_t sq = SQ_0;
if (move > 0) { if (m > 0) {
// 摆子或者走子 // 摆子或者走子
sq = (square_t)(move & 0x00ff); sq = (square_t)(m & 0x00ff);
} else { } else {
// 吃子 // 吃子
sq = (square_t)((-move) & 0x00ff); sq = (square_t)((-m) & 0x00ff);
} }
int nMills = st->position->board.inHowManyMills(sq, st->position->sideToMove); int nMills = st->position->board.inHowManyMills(sq, st->position->sideToMove);
@ -301,7 +301,7 @@ Node *Node::addChild(
#ifdef SORT_MOVE_WITH_HUMAN_KNOWLEDGES #ifdef SORT_MOVE_WITH_HUMAN_KNOWLEDGES
// TODO: rule.allowRemoveMultiPieces 以及 适配打三棋之外的其他规则 // TODO: rule.allowRemoveMultiPieces 以及 适配打三棋之外的其他规则
if (move > 0) { if (m > 0) {
// 在任何阶段, 都检测落子点是否能使得本方成三 // 在任何阶段, 都检测落子点是否能使得本方成三
// TODO: 为走子之前的统计故走棋阶段可能会从 @-0-@ 走成 0-@-@, 并未成三 // TODO: 为走子之前的统计故走棋阶段可能会从 @-0-@ 走成 0-@-@, 并未成三
if (nMills > 0) { if (nMills > 0) {
@ -346,11 +346,11 @@ Node *Node::addChild(
#ifdef ALPHABETA_AI #ifdef ALPHABETA_AI
if (rule.nTotalPiecesEachSide == 12 && if (rule.nTotalPiecesEachSide == 12 &&
st->getPiecesOnBoardCount(2) < 2 && // patch: 仅当白方第2着时 st->getPiecesOnBoardCount(2) < 2 && // patch: 仅当白方第2着时
Board::isStar(static_cast<square_t>(move))) { Board::isStar(static_cast<square_t>(m))) {
newNode->rating += RATING_STAR_SQUARE; newNode->rating += RATING_STAR_SQUARE;
} }
#endif #endif
} else if (move < 0) { } else if (m < 0) {
int nPlayerPiece = 0; int nPlayerPiece = 0;
int nOpponentPiece = 0; int nOpponentPiece = 0;
int nForbidden = 0; int nForbidden = 0;