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

Evaluation: refactor: 重命名函数

This commit is contained in:
Calcitem 2020-05-13 01:36:34 +08:00
parent 92991c4cb3
commit f8bae1b167
3 changed files with 29 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/ai/evaluate.cpp
View File

@ -20,7 +20,7 @@
#include "evaluate.h"
#ifdef ALPHABETA_AI
value_t Evaluation::getValue(Position *position)
value_t Eval::evaluate(Position *pos)
{
// 初始评估值为0，对先手有利则增大，对后手有利则减小
value_t value = VALUE_ZERO;
@ -29,20 +29,20 @@ value_t Evaluation::getValue(Position *position)
int nPiecesOnBoardDiff;
int nPiecesNeedRemove;
switch (position->phase) {
switch (pos->phase) {
case PHASE_READY:
break;
case PHASE_PLACING:
// 按手中的棋子计分，不要break;
nPiecesInHandDiff = position->nPiecesInHand[BLACK] - position->nPiecesInHand[WHITE];
nPiecesInHandDiff = pos->nPiecesInHand[BLACK] - pos->nPiecesInHand[WHITE];
value += nPiecesInHandDiff * VALUE_EACH_PIECE_INHAND;
// 按场上棋子计分
nPiecesOnBoardDiff = position->nPiecesOnBoard[BLACK] - position->nPiecesOnBoard[WHITE];
nPiecesOnBoardDiff = pos->nPiecesOnBoard[BLACK] - pos->nPiecesOnBoard[WHITE];
value += nPiecesOnBoardDiff * VALUE_EACH_PIECE_ONBOARD;
switch (position->action) {
switch (pos->action) {
// 选子和落子使用相同的评价方法
case ACTION_SELECT:
case ACTION_PLACE:
@ -50,8 +50,8 @@ value_t Evaluation::getValue(Position *position)
// 如果形成去子状态，每有一个可去的子，算100分
case ACTION_REMOVE:
nPiecesNeedRemove = (position->sideToMove == PLAYER_BLACK) ?
position->nPiecesNeedRemove : -(position->nPiecesNeedRemove);
nPiecesNeedRemove = (pos->sideToMove == PLAYER_BLACK) ?
pos->nPiecesNeedRemove : -(pos->nPiecesNeedRemove);
value += nPiecesNeedRemove * VALUE_EACH_PIECE_PLACING_NEEDREMOVE;
break;
default:
@ -62,15 +62,15 @@ value_t Evaluation::getValue(Position *position)
case PHASE_MOVING:
// 按场上棋子计分
value = position->nPiecesOnBoard[BLACK] * VALUE_EACH_PIECE_ONBOARD -
position->nPiecesOnBoard[WHITE] * VALUE_EACH_PIECE_ONBOARD;
value = pos->nPiecesOnBoard[BLACK] * VALUE_EACH_PIECE_ONBOARD -
pos->nPiecesOnBoard[WHITE] * VALUE_EACH_PIECE_ONBOARD;
#ifdef EVALUATE_MOBILITY
// 按棋子活动能力计分
value += st->position->getMobilityDiff(position->turn, position->nPiecesInHand[BLACK], position->nPiecesInHand[WHITE], false) * 10;
#endif /* EVALUATE_MOBILITY */
switch (position->action) {
switch (pos->action) {
// 选子和落子使用相同的评价方法
case ACTION_SELECT:
case ACTION_PLACE:
@ -78,8 +78,8 @@ value_t Evaluation::getValue(Position *position)
// 如果形成去子状态，每有一个可去的子，算128分
case ACTION_REMOVE:
nPiecesNeedRemove = (position->sideToMove == PLAYER_BLACK) ?
position->nPiecesNeedRemove : -(position->nPiecesNeedRemove);
nPiecesNeedRemove = (pos->sideToMove == PLAYER_BLACK) ?
pos->nPiecesNeedRemove : -(pos->nPiecesNeedRemove);
value += nPiecesNeedRemove * VALUE_EACH_PIECE_MOVING_NEEDREMOVE;
break;
default:
@ -91,7 +91,7 @@ value_t Evaluation::getValue(Position *position)
// 终局评价最简单
case PHASE_GAMEOVER:
// 布局阶段闷棋判断
if (position->nPiecesOnBoard[BLACK] + position->nPiecesOnBoard[WHITE] >=
if (pos->nPiecesOnBoard[BLACK] + pos->nPiecesOnBoard[WHITE] >=
Board::N_SEATS * Board::N_RINGS) {
if (rule.isStartingPlayerLoseWhenBoardFull) {
value -= VALUE_WIN;
@ -101,18 +101,18 @@ value_t Evaluation::getValue(Position *position)
}
// 走棋阶段被闷判断
else if (position->action == ACTION_SELECT &&
position->board.isAllSurrounded(position->sideId, position->nPiecesOnBoard, position->sideToMove) &&
else if (pos->action == ACTION_SELECT &&
pos->board.isAllSurrounded(pos->sideId, pos->nPiecesOnBoard, pos->sideToMove) &&
rule.isLoseWhenNoWay) {
// 规则要求被“闷”判负，则对手获胜
value_t delta = position->sideToMove == PLAYER_BLACK ? -VALUE_WIN : VALUE_WIN;
value_t delta = pos->sideToMove == PLAYER_BLACK ? -VALUE_WIN : VALUE_WIN;
value += delta;
}
// 剩余棋子个数判断
else if (position->nPiecesOnBoard[BLACK] < rule.nPiecesAtLeast) {
else if (pos->nPiecesOnBoard[BLACK] < rule.nPiecesAtLeast) {
value -= VALUE_WIN;
} else if (position->nPiecesOnBoard[WHITE] < rule.nPiecesAtLeast) {
} else if (pos->nPiecesOnBoard[WHITE] < rule.nPiecesAtLeast) {
value += VALUE_WIN;
}
@ -122,7 +122,7 @@ value_t Evaluation::getValue(Position *position)
break;
}
if (position->sideToMove == PLAYER_WHITE) {
if (pos->sideToMove == PLAYER_WHITE) {
value = -value;
}

27
src/ai/evaluate.h
View File

@ -25,69 +25,60 @@
#include "position.h"
#include "search.h"
class Evaluation
{
public:
Evaluation() = delete;
namespace Eval {
value_t evaluate(Position *pos);
Evaluation &operator=(const Evaluation &) = delete;
static value_t getValue(Position *Position);
// 评估子力
#ifdef EVALUATE_ENABLE
#ifdef EVALUATE_MATERIAL
static value_t evaluateMaterial()
value_t evaluateMaterial()
{
return 0;
}
#endif
#ifdef EVALUATE_SPACE
static value_t evaluateSpace()
value_t evaluateSpace()
{
return 0;
}
#endif
#ifdef EVALUATE_MOBILITY
static value_t evaluateMobility()
value_t evaluateMobility()
{
return 0;
}
#endif
#ifdef EVALUATE_TEMPO
static value_t evaluateTempo()
value_t evaluateTempo()
{
return 0;
}
#endif
#ifdef EVALUATE_THREAT
static value_t evaluateThreat()
value_t evaluateThreat()
{
return 0;
}
#endif
#ifdef EVALUATE_SHAPE
static value_t evaluateShape()
value_t evaluateShape()
{
return 0;
}
#endif
#ifdef EVALUATE_MOTIF
static value_t AIAlgorithm::evaluateMotif()
value_t AIAlgorithm::evaluateMotif()
{
return 0;
}
#endif
#endif /* EVALUATE_ENABLE */
private:
};
#endif /* EVALUATE_H */

2
src/ai/search.cpp
View File

@ -420,7 +420,7 @@ value_t AIAlgorithm::search(depth_t depth, value_t alpha, value_t beta)
depth <= 0 ||
unlikely(requiredQuit)) {
// 局面评估
bestValue = Evaluation::getValue(position);
bestValue = Eval::evaluate(position);
// 为争取速胜，value 值 +- 深度
if (bestValue > 0) {