test

Author: PikaCat-OuO

src/nnue/features/half_ka_v2_hm.h

@@ -174,18 +174,28 @@ class HalfKAv2_hm {
                 for (uint8_t us_knight_cannon = 0; us_knight_cannon <= 4; ++us_knight_cannon)
                     for (uint8_t opp_knight_cannon = 0; opp_knight_cannon <= 4; ++opp_knight_cannon)
                         v[us_rook][opp_rook][us_knight_cannon][opp_knight_cannon] = [&] {
-                            if (us_rook == opp_rook)
-                                return us_rook * 4
-                                     + int(us_knight_cannon + opp_knight_cannon >= 4) * 2
-                                     + int(us_knight_cannon == opp_knight_cannon);
-                            else if (us_rook == 2 && opp_rook == 1)
-                                return 12;
-                            else if (us_rook == 1 && opp_rook == 2)
-                                return 13;
-                            else if (us_rook > 0 && opp_rook == 0)
-                                return 14;
-                            else  // us_rook == 0 && opp_rook > 0
-                                return 15;
+                            if (us_rook > opp_rook)
+                                if (us_knight_cannon > opp_knight_cannon)
+                                    return 0;
+                                else if (us_knight_cannon == opp_knight_cannon)
+                                    return 1;
+                                else  // us_knight_cannon < opp_knight_cannon
+                                    return 2;
+                            else if (us_rook == opp_rook)
+                                if (us_knight_cannon > opp_knight_cannon)
+                                    return 3 + us_rook;
+                                else if (us_knight_cannon == opp_knight_cannon)
+                                    return 6 + us_rook
+                                         + int(us_rook == 0 && us_knight_cannon < 2 ? 3 : 0);
+                                else  // us_knight_cannon < opp_knight_cannon
+                                    return 10 + us_rook;
+                            else  // us_rook < opp_rook
+                                if (us_knight_cannon > opp_knight_cannon)
+                                    return 13;
+                                else if (us_knight_cannon == opp_knight_cannon)
+                                    return 14;
+                                else  // us_knight_cannon < opp_knight_cannon
+                                    return 15;
                         }();
         return v;
     }();