hh: 实现历史启发

实测效果不明显，暂不启用

include/config.h

@@ -94,6 +94,21 @@
 //#define TRANSPOSITION_TABLE_DEBUG
 #endif
 
+//#define HOSTORY_HEURISTIC
+
+#ifdef HOSTORY_HEURISTIC
+#define HOSTORY_HEURISTIC_ACTION_MOVE_ONLY
+//#define HOSTORY_HEURISTIC_SCORE_HIGH_WHEN_DEEPER
+#endif
+
+#ifdef HOSTORY_HEURISTIC
+//#define COMPARE_SCORE_ONLY
+//#define COMPARE_RATING_PREFERRED
+#define COMPARE_SCORE_PREFERRED
+#else
+#define COMPARE_RATING_ONLY
+#endif // HOSTORY_HEURISTIC
+
 #define PREFETCH_SUPPORT
 
 //#define USE_STD_STACK

millgame.pro

@@ -27,6 +27,7 @@ SOURCES += \
     src/ai/evaluate.cpp \
     src/ai/mcts.cpp \
     src/ai/movegen.cpp \
+    src/ai/movepick.cpp \
     src/ai/trainer.cpp \
     src/ai/tt.cpp \
     src/base/memmgr.cpp \
@@ -59,6 +60,7 @@ HEADERS  += \
     src/ai/evaluate.h \
     src/ai/mcts.h \
     src/ai/movegen.h \
+    src/ai/movepick.h \
     src/ai/trainer.h \
     src/ai/tt.h \
     src/base/HashNode.h \

millgame.vcxproj

@@ -455,6 +455,7 @@
     <ClInclude Include="src\ai\evaluate.h" />
     <ClInclude Include="src\ai\mcts.h" />
     <ClInclude Include="src\ai\movegen.h" />
+    <ClInclude Include="src\ai\movepick.h" />
     <ClInclude Include="src\ai\search.h" />
     <ClInclude Include="src\ai\trainer.h" />
     <ClInclude Include="src\ai\tt.h" />
@@ -716,6 +717,7 @@
     <ClCompile Include="src\ai\evaluate.cpp" />
     <ClCompile Include="src\ai\mcts.cpp" />
     <ClCompile Include="src\ai\movegen.cpp" />
+    <ClCompile Include="src\ai\movepick.cpp" />
     <ClCompile Include="src\ai\search.cpp" />
     <ClCompile Include="src\ai\trainer.cpp" />
     <ClCompile Include="src\ai\tt.cpp" />

millgame.vcxproj.filters

@@ -150,6 +150,9 @@
     <ClInclude Include="src\base\prefetch.h">
       <Filter>base</Filter>
     </ClInclude>
+    <ClInclude Include="src\ai\movepick.h">
+      <Filter>ai</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="debug\moc_predefs.h.cbt">
@@ -392,6 +395,9 @@
     <ClCompile Include="src\ai\mcts.cpp">
       <Filter>ai</Filter>
     </ClCompile>
+    <ClCompile Include="src\ai\movepick.cpp">
+      <Filter>ai</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="millgame.rc">

src/ai/movepick.cpp

@@ -21,3 +21,65 @@
 #include "option.h"
 #include "types.h"
 #include "config.h"
+
+MovePicker::MovePicker()
+{
+#ifdef HOSTORY_HEURISTIC
+    clearHistoryScore();
+#endif
+}
+
+#ifdef HOSTORY_HEURISTIC
+score_t MovePicker::getHistoryScore(move_t move)
+{
+    score_t ret = 0;
+
+    if (move < 0) {
+#ifndef HOSTORY_HEURISTIC_ACTION_MOVE_ONLY
+        ret = placeHistory[-move];
+#endif
+    } else if (move & 0x7f00) {
+        ret = moveHistory[move];
+    } else {
+#ifndef HOSTORY_HEURISTIC_ACTION_MOVE_ONLY
+        ret = placeHistory[move];
+#endif
+    }
+
+    return ret;
+}
+
+void MovePicker::setHistoryScore(move_t move, depth_t depth)
+{
+    if (move == MOVE_NONE) {
+        return;
+    }
+
+#ifdef HOSTORY_HEURISTIC_SCORE_HIGH_WHEN_DEEPER
+    score_t score = 1 << (32 - depth);
+#else
+    score_t score = 1 << depth;
+#endif
+
+    if (move < 0) {
+#ifndef HOSTORY_HEURISTIC_ACTION_MOVE_ONLY
+        placeHistory[-move] += score;
+#endif
+    } else if (move & 0x7f00) {
+        moveHistory[move] += score;
+    } else {
+#ifndef HOSTORY_HEURISTIC_ACTION_MOVE_ONLY
+        moveHistory[move] += score;
+#endif
+    }
+}
+
+void MovePicker::clearHistoryScore()
+{
+#ifndef HOSTORY_HEURISTIC_ACTION_MOVE_ONLY
+    memset(placeHistory, 0, sizeof(placeHistory));
+    memset(captureHistory, 0, sizeof(captureHistory));
+#endif
+    memset(moveHistory, 0, sizeof(moveHistory));
+}
+#endif // HOSTORY_HEURISTIC

src/ai/movepick.h

@@ -23,56 +23,21 @@
 #include "stack.h"
 #include "types.h"
 
-// TODO: Fix size
-typedef Stack<score_t, 64> PlaceHistory;
-typedef Stack<score_t, 64> CaptureHistory;
-typedef Stack<score_t, 10240> MoveHistory;
-
 class MovePicker
 {
 public:
-    static PlaceHistory placeHistory;
-    static CaptureHistory captureHistory;
-    static MoveHistory moveHistory;
+    MovePicker();
 
-    static score_t getHistoryScore(move_t move)
-    {
-        score_t ret;
+#ifdef HOSTORY_HEURISTIC
+    // TODO: Fix size
+    score_t placeHistory[64];
+    score_t captureHistory[64];
+    score_t moveHistory[10240];
 
-        if (move < 0) {
-            ret = placeHistory[-move];
-        } else if (move & 0x7f00) {
-            ret = moveHistory[move];
-        } else {
-            ret = placeHistory[move & 0x007f];
-        }
-
-        return ret;
-    }
-
-    static void setHistoryScore(move_t move, depth_t depth)
-    {
-        if (move == MOVE_NONE) {
-            return;
-        }
-
-        score_t score = 1 << depth;
-
-        if (move < 0) {
-            placeHistory[-move] += score;
-        } else if (move & 0x7f00) {
-            moveHistory[move] += score;
-        } else {
-            moveHistory[move & 0x007f] += score;
-        }
-    }
-
-    static void clearHistoryScore()
-    {
-        placeHistory.clear();
-        captureHistory.clear();
-        moveHistory.clear();
-    }
+    score_t getHistoryScore(move_t move);
+    void setHistoryScore(move_t move, depth_t depth);
+    void clearHistoryScore();
+#endif // HOSTORY_HEURISTIC
 };
 
 #endif // MOVEPICK_H

src/ai/search.cpp

@@ -31,6 +31,7 @@
 #include "types.h"
 #include "option.h"
 #include "misc.h"
+#include "movepick.h"
 
 #define SORT_NAME nodep
 #define SORT_TYPE Node*
@@ -51,6 +52,7 @@ AIAlgorithm::AIAlgorithm()
 {
     state = new StateInfo();
     st = new StateInfo();
+    movePicker = new MovePicker();
 
     memmgr.memmgr_init();
 
@@ -200,6 +202,10 @@ Node *Node::addChild(
 
     newNode->move = m;
 
+#ifdef HOSTORY_HEURISTIC
+    newNode->score = ai->movePicker->getHistoryScore(m);
+#endif
+
 #ifdef ALPHABETA_AI
     newNode->value = VALUE_ZERO;
     newNode->rating = RATING_ZERO;
@@ -380,19 +386,37 @@ Node *Node::addChild(
 #ifdef ALPHABETA_AI
 int AIAlgorithm::nodeCompare(const Node *first, const Node *second)
 {
-#if 0
-    if (first->rating == second->rating) {
-        if (first->value == second->value) {
+#ifdef COMPARE_RATING_ONLY
+    return second->rating - first->rating;
+#endif
+
+#ifdef COMPARE_SCORE_ONLY
+    return second->score - first->score;
+#endif
+
+#ifdef COMPARE_SCORE_PREFERRED
+    if (first->score == second->score) {
+        if (first->rating == second->rating) {
             return 0;
         }
 
-        return (first->value < second->value ? 1 : -1);
+        return (first->rating < second->rating ? 1 : -1);
+    }
+
+    return (first->score < second->score ? 1 : -1);
+#endif
+
+#ifdef COMPARE_RATING_PREFERRED
+    if (first->rating == second->rating) {
+        if (first->score == second->score) {
+            return 0;
+        }
+
+        return (first->score < second->score ? 1 : -1);
     }
 
     return (first->rating < second->rating ? 1 : -1);
 #endif
-
-    return second->rating - first->rating;
 }
 #endif
 
@@ -973,6 +997,10 @@ out:
                   );
 #endif /* TRANSPOSITION_TABLE_ENABLE */
 
+#ifdef HOSTORY_HEURISTIC
+    movePicker->setHistoryScore(best, depth);
+#endif
+
     // 返回
     return node->value;
 }
@@ -1029,11 +1057,16 @@ const char* AIAlgorithm::ttMove()
             charChoose = ' ';
         }
 
-        loggerDebug("[%.2d] %d\t%s\t%d\t%d %c\n", moveIndex,
+        loggerDebug("[%.2d] %d\t%s\t%d\t%d\t%u %c\n", moveIndex,
                     root->children[i]->move,
                     moveToCommand(root->children[i]->move),
                     root->children[i]->value,
                     root->children[i]->rating,
+#ifdef HOSTORY_HEURISTIC
+                    root->children[i]->score,
+#else
+                    0,
+#endif
                     charChoose);
 
         moveIndex++;

src/ai/search.h

@@ -40,6 +40,7 @@
 #include "types.h"
 #include "memmgr.h"
 #include "misc.h"
+#include "movepick.h"
 #ifdef CYCLE_STAT
 #include "stopwatch.h"
 #endif
@@ -118,6 +119,9 @@ public:
 #ifdef ALPHABETA_AI
     value_t value { VALUE_UNKNOWN };
     rating_t rating { RATING_ZERO };
+#ifdef HOSTORY_HEURISTIC
+    score_t score { 0 };
+#endif
 #endif // ALPHABETA_AI
 
     player_t sideToMove { PLAYER_NOBODY };
@@ -171,6 +175,9 @@ public:
     {
         loggerDebug("Timeout\n");
         requiredQuit = true;
+#ifdef HOSTORY_HEURISTIC
+        movePicker->clearHistoryScore();
+#endif
     }
 
 #ifdef ALPHABETA_AI
@@ -275,6 +282,8 @@ public:
     // 原始模型
     StateInfo *state { nullptr };
 
+    MovePicker *movePicker { nullptr };
+
 private:
 
     // 演算用的模型

src/base/stack.h

@@ -21,6 +21,7 @@
 #define STACK_H
 
 #include <cstdlib>
+#include <cassert>
 
 template <typename T, size_t capacity = 128>
 class Stack

src/game/types.h

@@ -25,6 +25,7 @@
 using step_t = uint16_t;
 using depth_t = int8_t;
 using location_t = uint8_t;
+using score_t = uint32_t;
 
 #ifdef TRANSPOSITION_TABLE_CUTDOWN
 using hash_t = uint32_t;