From 5c0037de7fe0bc7efece17bf0573412c079bf909 Mon Sep 17 00:00:00 2001
From: Hisayori Noda <nodchip@gmail.com>
Date: Sun, 7 Jul 2019 17:02:34 +0900
Subject: [PATCH] Added the castling right feature.  Added k-p-cr_256x2-32-32
 architecture.

---
 .../nnue/architectures/k-p-cr_256x2-32-32.h   | 37 ++++++++++
 src/eval/nnue/features/castling_right.cpp     | 73 +++++++++++++++++++
 src/eval/nnue/features/castling_right.h       | 48 ++++++++++++
 src/eval/nnue/nnue_architecture.h             | 13 +---
 4 files changed, 161 insertions(+), 10 deletions(-)
 create mode 100644 src/eval/nnue/architectures/k-p-cr_256x2-32-32.h
 create mode 100644 src/eval/nnue/features/castling_right.cpp
 create mode 100644 src/eval/nnue/features/castling_right.h

diff --git a/src/eval/nnue/architectures/k-p-cr_256x2-32-32.h b/src/eval/nnue/architectures/k-p-cr_256x2-32-32.h
new file mode 100644
index 00000000..9ce7ecf1
--- /dev/null
+++ b/src/eval/nnue/architectures/k-p-cr_256x2-32-32.h
@@ -0,0 +1,37 @@
+// NNUE•]‰¿ŠÖ�”‚Å—p‚¢‚é“ü—Í“Á’¥—ʂƃlƒbƒgƒ��[ƒN�\‘¢‚Ì’è‹`
+
+#include "../features/feature_set.h"
+#include "../features/k.h"
+#include "../features/p.h"
+#include "../features/castling_right.h"
+
+#include "../layers/input_slice.h"
+#include "../layers/affine_transform.h"
+#include "../layers/clipped_relu.h"
+
+namespace Eval {
+
+  namespace NNUE {
+
+    // •]‰¿ŠÖ�”‚Å—p‚¢‚é“ü—Í“Á’¥—Ê
+    using RawFeatures = Features::FeatureSet<Features::K, Features::P,
+      Features::CastlingRight>;
+
+    // •ÏŠ·Œã‚Ì“ü—Í“Á’¥—Ê‚ÌŽŸŒ³�”
+    constexpr IndexType kTransformedFeatureDimensions = 256;
+
+    namespace Layers {
+
+      // ƒlƒbƒgƒ��[ƒN�\‘¢‚Ì’è‹`
+      using InputLayer = InputSlice<kTransformedFeatureDimensions * 2>;
+      using HiddenLayer1 = ClippedReLU<AffineTransform<InputLayer, 32>>;
+      using HiddenLayer2 = ClippedReLU<AffineTransform<HiddenLayer1, 32>>;
+      using OutputLayer = AffineTransform<HiddenLayer2, 1>;
+
+    }  // namespace Layers
+
+    using Network = Layers::OutputLayer;
+
+  }  // namespace NNUE
+
+}  // namespace Eval
diff --git a/src/eval/nnue/features/castling_right.cpp b/src/eval/nnue/features/castling_right.cpp
new file mode 100644
index 00000000..30e46e23
--- /dev/null
+++ b/src/eval/nnue/features/castling_right.cpp
@@ -0,0 +1,73 @@
+// NNUE評価関数�入力特徴�K�定義
+
+#if defined(EVAL_NNUE)
+
+#include "castling_right.h"
+#include "index_list.h"
+
+namespace Eval {
+
+  namespace NNUE {
+
+    namespace Features {
+
+      // 特徴�����値�1��るインデックス�リストを�得�る
+      void CastlingRight::AppendActiveIndices(
+        const Position& pos, Color perspective, IndexList* active) {
+        // コンパイラ�警告を回��る����列サイズ����場��何も���
+        if (RawFeatures::kMaxActiveDimensions < kMaxActiveDimensions) return;
+
+        int castling_rights = pos.state()->castlingRights;
+        int relative_castling_rights;
+        if (perspective == WHITE) {
+          relative_castling_rights = castling_rights;
+        }
+        else {
+          // Invert the perspective.
+          relative_castling_rights = ((castling_rights & 3) << 2)
+            & ((castling_rights >> 2) & 3);
+        }
+
+        for (int i = 0; i < kDimensions; ++i) {
+          if (relative_castling_rights & (i << 1)) {
+            active->push_back(i);
+          }
+        }
+      }
+
+      // 特徴�����一手��ら値�変化��インデックス�リストを�得�る
+      void CastlingRight::AppendChangedIndices(
+        const Position& pos, Color perspective,
+        IndexList* removed, IndexList* added) {
+
+        int previous_castling_rights = pos.state()->previous->castlingRights;
+        int current_castling_rights = pos.state()->castlingRights;
+        int relative_previous_castling_rights;
+        int relative_current_castling_rights;
+        if (perspective == WHITE) {
+          relative_previous_castling_rights = previous_castling_rights;
+          relative_current_castling_rights = current_castling_rights;
+        }
+        else {
+          // Invert the perspective.
+          relative_previous_castling_rights = ((previous_castling_rights & 3) << 2)
+            & ((previous_castling_rights >> 2) & 3);
+          relative_current_castling_rights = ((current_castling_rights & 3) << 2)
+            & ((current_castling_rights >> 2) & 3);
+        }
+
+        for (int i = 0; i < kDimensions; ++i) {
+          if ((relative_previous_castling_rights & (i << 1)) &&
+            (relative_current_castling_rights & (i << 1)) == 0) {
+            removed->push_back(i);
+          }
+        }
+      }
+
+    }  // namespace Features
+
+  }  // namespace NNUE
+
+}  // namespace Eval
+
+#endif  // defined(EVAL_NNUE)
diff --git a/src/eval/nnue/features/castling_right.h b/src/eval/nnue/features/castling_right.h
new file mode 100644
index 00000000..1384865f
--- /dev/null
+++ b/src/eval/nnue/features/castling_right.h
@@ -0,0 +1,48 @@
+// NNUE•]‰¿ŠÖ�”‚Ì“ü—Í“Á’¥—ÊK‚Ì’è‹`
+
+#ifndef _NNUE_FEATURES_CASTLING_RIGHT_H_
+#define _NNUE_FEATURES_CASTLING_RIGHT_H_
+
+#if defined(EVAL_NNUE)
+
+#include "../../../evaluate.h"
+#include "features_common.h"
+
+namespace Eval {
+
+  namespace NNUE {
+
+    namespace Features {
+
+      // “Á’¥—ÊK�F‹Ê‚̈ʒu
+      class CastlingRight {
+      public:
+        // “Á’¥—Ê–¼
+        static constexpr const char* kName = "CastlingRight";
+        // •]‰¿ŠÖ�”ƒtƒ@ƒCƒ‹‚É–„‚ß�ž‚ÞƒnƒbƒVƒ…’l
+        static constexpr std::uint32_t kHashValue = 0x913968AAu;
+        // “Á’¥—Ê‚ÌŽŸŒ³�”
+        static constexpr IndexType kDimensions = 4;
+        // “Á’¥—Ê‚Ì‚¤‚¿�A“¯Žž‚É’l‚ª1‚Æ‚È‚éƒCƒ“ƒfƒbƒNƒX‚Ì�”‚Ì�Å‘å’l
+        static constexpr IndexType kMaxActiveDimensions = 4;
+        // �·•ªŒvŽZ‚Ì‘ã‚í‚è‚É‘SŒvŽZ‚ð�s‚¤ƒ^ƒCƒ~ƒ“ƒO
+        static constexpr TriggerEvent kRefreshTrigger = TriggerEvent::kNone;
+
+        // “Á’¥—Ê‚Ì‚¤‚¿�A’l‚ª1‚Å‚ ‚éƒCƒ“ƒfƒbƒNƒX‚̃ŠƒXƒg‚ðŽæ“¾‚·‚é
+        static void AppendActiveIndices(const Position& pos, Color perspective,
+          IndexList* active);
+
+        // “Á’¥—Ê‚Ì‚¤‚¿�AˆêŽè‘O‚©‚ç’l‚ª•Ï‰»‚µ‚½ƒCƒ“ƒfƒbƒNƒX‚̃ŠƒXƒg‚ðŽæ“¾‚·‚é
+        static void AppendChangedIndices(const Position& pos, Color perspective,
+          IndexList* removed, IndexList* added);
+      };
+
+    }  // namespace Features
+
+  }  // namespace NNUE
+
+}  // namespace Eval
+
+#endif  // defined(EVAL_NNUE)
+
+#endif
diff --git a/src/eval/nnue/nnue_architecture.h b/src/eval/nnue/nnue_architecture.h
index 5f11a02b..3170cdab 100644
--- a/src/eval/nnue/nnue_architecture.h
+++ b/src/eval/nnue/nnue_architecture.h
@@ -6,16 +6,9 @@
 #if defined(EVAL_NNUE)
 
 // 入力特徴���ットワーク構造�定義�れ�ヘッダをinclude�る
-
-// KP256型を使��������れを事��define�る。
-#define EVAL_NNUE_KP256
-#if defined(EVAL_NNUE_KP256)
-#include "architectures/k-p_256x2-32-32.h"
-#else // #if defined(EVAL_NNUE_HALFKP256)
-
-// NNUE評価関数�デフォルト��halfKP256
-#include "architectures/halfkp_256x2-32-32.h"
-#endif
+//#include "architectures/k-p_256x2-32-32.h"
+#include "architectures/k-p-cr_256x2-32-32.h"
+//#include "architectures/halfkp_256x2-32-32.h"
 
 namespace Eval {