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

IDS: 将迭代加深开关做到界面菜单中而不再用宏控制

This commit is contained in:
Calcitem 2020-03-22 23:09:53 +08:00
parent e5ee9ca7be
commit b0594698ad
8 changed files with 111 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gamewindow.ui
View File

@ -314,11 +314,18 @@
<addaction name="actionLimited_T"/>
<addaction name="separator"/>
</widget>
<widget class="QMenu" name="menu_A">
<property name="title">
<string>算法(&amp;A)</string>
</property>
<addaction name="actionIDS_I"/>
</widget>
<addaction name="menu_F"/>
<addaction name="menu_C"/>
<addaction name="menu_M"/>
<addaction name="menu_R"/>
<addaction name="menu_E"/>
<addaction name="menu_A"/>
<addaction name="menu_O"/>
<addaction name="menu_H"/>
</widget>
@ -1220,6 +1227,14 @@
<string>先后手轮替(&amp;C)</string>
</property>
</action>
<action name="actionIDS_I">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>迭代加深(&amp;I)</string>
</property>
</action>
</widget>
<layoutdefault spacing="6" margin="11"/>
<customwidgets>

1
include/config.h
View File

@ -82,7 +82,6 @@
//#define DEAL_WITH_HORIZON_EFFECT
//#define IDS_SUPPORT
//#define IDS_WINDOW
//#define IDS_DEBUG
//#define IDS_ADD_VALUE

136
src/ai/search.cpp
View File

@ -581,99 +581,99 @@ int AIAlgorithm::search(depth_t depth)
value_t alpha = -VALUE_INFINITE;
value_t beta = VALUE_INFINITE;
#ifdef IDS_SUPPORT
// 深化迭代
if (gameOptions.getIDSEnabled()) {
// 深化迭代
loggerDebug("IDS: ");
loggerDebug("IDS: ");
depth_t depthBegin = 2;
value_t lastValue = VALUE_ZERO;
depth_t depthBegin = 2;
value_t lastValue = VALUE_ZERO;
loggerDebug("\n==============================\n");
loggerDebug("==============================\n");
loggerDebug("==============================\n");
loggerDebug("\n==============================\n");
loggerDebug("==============================\n");
loggerDebug("==============================\n");
for (depth_t i = depthBegin; i < d; i += 1) {
for (depth_t i = depthBegin; i < d; i += 1) {
#ifdef TRANSPOSITION_TABLE_ENABLE
#ifdef CLEAR_TRANSPOSITION_TABLE
TT::clear(); // 每次走子前清空哈希表
TT::clear(); // 每次走子前清空哈希表
#endif
#endif
value = search(i, alpha, beta, root);
value = search(i, alpha, beta, root);
loggerDebug("%d(%d) ", value, value - lastValue);
loggerDebug("%d(%d) ", value, value - lastValue);
#ifdef IDS_DEBUG
loggerDebug(": --------------- depth = %d/%d ---------------\n", i, d);
int k = 0;
int cs = root->childrenSize;
for (int j = 0; j < cs; j++) {
if (root->children[j]->value == root->value
loggerDebug(": --------------- depth = %d/%d ---------------\n", i, d);
int k = 0;
int cs = root->childrenSize;
for (int j = 0; j < cs; j++) {
if (root->children[j]->value == root->value
#ifdef SORT_CONSIDER_PRUNED
&& !root->children[j]->pruned
&& !root->children[j]->pruned
#endif
) {
loggerDebug("[%.2d] %d\t%s\t%d\t%d *\n", k,
root->children[j]->move,
moveToCommand(root->children[j]->move),
root->children[j]->value,
root->children[j]->rating);
} else {
loggerDebug("[%.2d] %d\t%s\t%d\t%d\n", k,
root->children[j]->move,
moveToCommand(root->children[j]->move),
root->children[j]->value,
root->children[j]->rating);
}
) {
loggerDebug("[%.2d] %d\t%s\t%d\t%d *\n", k,
root->children[j]->move,
moveToCommand(root->children[j]->move),
root->children[j]->value,
root->children[j]->rating);
} else {
loggerDebug("[%.2d] %d\t%s\t%d\t%d\n", k,
root->children[j]->move,
moveToCommand(root->children[j]->move),
root->children[j]->value,
root->children[j]->rating);
}
k++;
}
loggerDebug("\n");
k++;
}
loggerDebug("\n");
#endif // IDS_DEBUG
lastValue = value;
lastValue = value;
#if 0
if (value <= alpha) {
alpha = -VALUE_INFINITE;
beta = value + 1; // X
continue;
}
if (value >= beta) {
beta = VALUE_INFINITE;
alpha = value - 1;
continue;
}
if (value <= alpha) {
alpha = -VALUE_INFINITE;
beta = value + 1; // X
continue;
}
if (value >= beta) {
beta = VALUE_INFINITE;
alpha = value - 1;
continue;
}
#endif
#ifdef IDS_WINDOW
alpha = value - VALUE_IDS_WINDOW;
beta = value + VALUE_IDS_WINDOW;
alpha = value - VALUE_IDS_WINDOW;
beta = value + VALUE_IDS_WINDOW;
#endif // IDS_WINDOW
}
}
#ifdef TIME_STAT
timeEnd = chrono::steady_clock::now();
loggerDebug("\nIDS Time: %llus\n", chrono::duration_cast<chrono::seconds>(timeEnd - timeStart).count());
timeEnd = chrono::steady_clock::now();
loggerDebug("\nIDS Time: %llus\n", chrono::duration_cast<chrono::seconds>(timeEnd - timeStart).count());
#endif
#endif /* IDS_SUPPORT */
}
#ifdef TRANSPOSITION_TABLE_ENABLE
#ifdef CLEAR_TRANSPOSITION_TABLE
TT::clear(); // 每次走子前清空哈希表
TT::clear(); // 每次走子前清空哈希表
#endif
#endif
#ifdef IDS_SUPPORT
if (gameOptions.getIDSEnabled()) {
#ifdef IDS_WINDOW
value_t window = state->getPhase() == PHASE_PLACING ? VALUE_PLACING_WINDOW : VALUE_MOVING_WINDOW;
alpha = value - window;
beta = value + window;
value_t window = state->getPhase() == PHASE_PLACING ? VALUE_PLACING_WINDOW : VALUE_MOVING_WINDOW;
alpha = value - window;
beta = value + window;
#else
alpha = -VALUE_INFINITE;
beta = VALUE_INFINITE;
alpha = -VALUE_INFINITE;
beta = VALUE_INFINITE;
#endif // IDS_WINDOW
#endif // IDS_SUPPORT
}
value = search(d, alpha, beta, root);
@ -977,17 +977,17 @@ value_t AIAlgorithm::search(depth_t depth, value_t alpha, value_t beta, Node *no
}
#endif // DONOT_DELETE_TREE
#ifdef IDS_SUPPORT
if (gameOptions.getIDSEnabled()) {
#ifdef IDS_ADD_VALUE
if (st->position->sideToMove == PLAYER_BLACK) {
node->children[0]->value += 1;
node->value += 1;
} else {
node->children[0]->value -= 1;
node->value -= 1;
}
if (st->position->sideToMove == PLAYER_BLACK) {
node->children[0]->value += 1;
node->value += 1;
} else {
node->children[0]->value -= 1;
node->value -= 1;
}
#endif /* IDS_ADD_VALUE */
#endif // IDS_SUPPORT
}
#ifdef TRANSPOSITION_TABLE_ENABLE
// 记录不一定确切的哈希值

10
src/game/option.cpp
View File

@ -78,3 +78,13 @@ bool Options::getLearnEndgameEnabled()
return learnEndgame;
#endif
}
void Options::setIDSEnabled(bool enabled)
{
IDSEnabled = enabled;
}
bool Options::getIDSEnabled()
{
return IDSEnabled;
}

7
src/game/option.h
View File

@ -39,6 +39,10 @@ public:
void setLearnEndgameEnabled(bool enabled);
bool getLearnEndgameEnabled();
void setIDSEnabled(bool enabled);
bool getIDSEnabled();
protected:
private:
@ -60,6 +64,9 @@ private:
#else
bool learnEndgame { false };
#endif
// Alpha-Beta 搜索时是否迭代加深
bool IDSEnabled { false };
};
extern Options gameOptions;

5
src/ui/qt/gamecontroller.cpp
View File

@ -432,6 +432,11 @@ void GameController::setLearnEndgame(bool enabled)
#endif
}
void GameController::setIDS(bool enabled)
{
gameOptions.setIDSEnabled(enabled);
}
// 上下翻转
void GameController::flip()
{

3
src/ui/qt/gamecontroller.h
View File

@ -177,6 +177,9 @@ public slots:
// AI 是否记录残局库
void setLearnEndgame(bool enabled);
// Alpha-Beta 搜索时是否迭代加深
void setIDS(bool enabled);
// 上下翻转
void flip();

3
src/ui/qt/gamewindow.cpp
View File

@ -242,6 +242,9 @@ void MillGameWindow::initialize()
connect(ui.actionLearnEndgame_E, SIGNAL(toggled(bool)),
gameController, SLOT(setLearnEndgame(bool)));
connect(ui.actionIDS_I, SIGNAL(toggled(bool)),
gameController, SLOT(setIDS(bool)));
// 视图上下翻转
connect(ui.actionFlip_F, &QAction::triggered,
gameController, &GameController::flip);