khetai 0.2.3 → 0.3.2

data/ext/khetai/khetai_lib.h

@@ -1,8 +1,9 @@
 #ifndef KHET_LIB_H_INCLUDED
 #define KHET_LIB_H_INCLUDED
 
-#include <stdint.h>
 #include <stdbool.h>
+#include <stdint.h>
+#include <time.h>
 
 #ifdef __cplusplus
 #include <ctime>
@@ -15,44 +16,29 @@ typedef uint32_t Move;
 #define MAX_SCORE 9999999
 #define MAX_DEPTH 25
 
-enum Player
-{
-    Silver,
-    Red
+enum Player {
+    SILVER,
+    RED
 };
-enum Piece
-{
-    Anubis = 1,
-    Pyramid = 2,
-    Scarab = 3,
-    Pharaoh = 4,
-    Sphinx = 5
+enum Piece {
+    ANUBIS = 1,
+    PYRAMID = 2,
+    SCARAB = 3,
+    PHARAOH = 4,
+    SPHINX = 5
 };
-enum Orientation
-{
-    North,
-    East,
-    South,
-    West
+enum Orientation {
+    NORTH,
+    EAST,
+    SOUTH,
+    WEST
 };
 
-extern enum Player whose_turn;
-extern enum Player starter;
-extern int initial_depth;
-
 // north, east, south, west, diagonals
 static const int directions[8] = {-12, 1, 12, -1, (12 + 1), (12 - 1), (-12 + 1), (-12 - 1)};
 static const int rotations[2] = {1, -1};
 static const int sphinx_loc[2] = {106, 13};
 
-extern int pharaoh_loc[2];
-
-extern Square board[120];
-extern Move undo_moves[MAX_DEPTH];
-extern int undo_capture_indices[MAX_DEPTH];
-extern Square undo_capture_squares[MAX_DEPTH];
-extern int undo_index;
-
 static const int can_move[2][120] = {
     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
      0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0,
@@ -92,39 +78,21 @@ extern time_t start_time;
 extern int max_time;
 
 #ifdef __cplusplus
-extern "C"
-{
+extern "C" {
 #endif
 
-    void set_time_parameters(int _max_time, time_t _start_time);
-    void reset_undo();
-    void init_zobrist();
-    void setup_board(char *board[]);
-    Move alphabeta_root(int depth, enum Player player);
-    void make_move(Move move);
-    void print_board();
+void set_time_parameters(int _max_time, time_t _start_time);
+void reset_undo();
+void init_zobrist();
+void setup_board(char *board[]);
+Move alphabeta_root(int depth, enum Player player);
+void make_move(Move move);
+void print_board();
 
 #ifdef __cplusplus
 }
 #endif
 
-Square str_to_square(char *str);
-void print_piece(Square s);
-
-void find_valid_moves(Move *valid_moves, int *vi);
-void find_valid_anubis_pyramid_moves(int i, Move *valid_moves, int *vi);
-void find_valid_scarab_moves(int i, Move *valid_moves, int *vi);
-void find_valid_pharaoh_moves(int i, Move *valid_moves, int *vi);
-void find_valid_sphinx_moves(int i, Move *valid_moves, int *vi);
-
-int alphabeta(int depth, enum Player player, int alpha, int beta);
-int calculate_score();
-int distance_from_pharaoh(int i, int p);
-
-void undo_move();
-void fire_laser(uint64_t *hash);
-bool is_move_legal(Move move);
-
 static inline bool is_piece(Square s) { return s > 0; }
 
 static inline enum Player get_owner(Square s) { return (enum Player)(s >> 1 & 0x1); }
@@ -137,18 +105,16 @@ static inline int get_end(Move m) { return m >> 8 & 0x7F; }
 static inline int get_rotation(Move m) { return (m >> 15 & 0x3) - 2; }
 
 #ifdef __cplusplus
-extern "C"
-{
+extern "C" {
 #endif
-    int get_start_wrapper(Move move);
-    int get_end_wrapper(Move move);
-    int get_rotation_wrapper(Move move);
+int get_start_wrapper(Move move);
+int get_end_wrapper(Move move);
+int get_rotation_wrapper(Move move);
 #ifdef __cplusplus
 }
 #endif
 
-static inline Square rotate(Square s, int rotation)
-{
+static inline Square rotate(Square s, int rotation) {
     int orientation = get_orientation(s);
     orientation = (orientation + rotation) % 4;
     if (orientation < 0)
@@ -156,52 +122,43 @@ static inline Square rotate(Square s, int rotation)
     return (s & 0x1F) + (orientation << 5);
 }
 
-static inline enum Player opposite_player(enum Player player)
-{
-    return player == Red ? Silver : Red;
+static inline enum Player opposite_player(enum Player player) {
+    return player == RED ? SILVER : RED;
 }
 
-#define Dead -1
-#define Absorbed -2
+#define DEAD -1
+#define ABSORBED -2
 
 // [laser direciton][piece type][piece orientation] = reflection result
 // anubis, pyramid, scarab, pharaoh, sphinx
 static const int reflections[4][5][4] = {
     {// North
-     {Dead, Dead, Absorbed, Dead},
-     {Dead, East, West, Dead},
-     {West, East, West, East},
-     {Dead, Dead, Dead, Dead},
-     {Absorbed, Absorbed, Absorbed, Absorbed}},
+     {DEAD, DEAD, ABSORBED, DEAD},
+     {DEAD, EAST, WEST, DEAD},
+     {WEST, EAST, WEST, EAST},
+     {DEAD, DEAD, DEAD, DEAD},
+     {ABSORBED, ABSORBED, ABSORBED, ABSORBED}},
     {// East
-     {Dead, Dead, Dead, Absorbed},
-     {Dead, Dead, South, North},
-     {South, North, South, North},
-     {Dead, Dead, Dead, Dead},
-     {Absorbed, Absorbed, Absorbed, Absorbed}},
+     {DEAD, DEAD, DEAD, ABSORBED},
+     {DEAD, DEAD, SOUTH, NORTH},
+     {SOUTH, NORTH, SOUTH, NORTH},
+     {DEAD, DEAD, DEAD, DEAD},
+     {ABSORBED, ABSORBED, ABSORBED, ABSORBED}},
     {// South
-     {Absorbed, Dead, Dead, Dead},
-     {East, Dead, Dead, West},
-     {East, West, East, West},
-     {Dead, Dead, Dead, Dead},
-     {Absorbed, Absorbed, Absorbed, Absorbed}},
+     {ABSORBED, DEAD, DEAD, DEAD},
+     {EAST, DEAD, DEAD, WEST},
+     {EAST, WEST, EAST, WEST},
+     {DEAD, DEAD, DEAD, DEAD},
+     {ABSORBED, ABSORBED, ABSORBED, ABSORBED}},
     {// West
-     {Dead, Absorbed, Dead, Dead},
-     {North, South, Dead, Dead},
-     {North, South, North, South},
-     {Dead, Dead, Dead, Dead},
-     {Absorbed, Absorbed, Absorbed, Absorbed}}};
-
-extern uint64_t keys[0xFF][120];
-extern uint64_t hashes[MAX_DEPTH];
-extern uint64_t turn_key;
-extern int move_num;
-extern bool checkmate;
-
-uint64_t get_board_hash();
+     {DEAD, ABSORBED, DEAD, DEAD},
+     {NORTH, SOUTH, DEAD, DEAD},
+     {NORTH, SOUTH, NORTH, SOUTH},
+     {DEAD, DEAD, DEAD, DEAD},
+     {ABSORBED, ABSORBED, ABSORBED, ABSORBED}}};
+
 static uint64_t seed = 1070372;
-static inline uint64_t random_number()
-{
+static inline uint64_t random_number() {
     seed ^= seed >> 12;
     seed ^= seed << 25;
     seed ^= seed >> 27;
@@ -209,12 +166,12 @@ static inline uint64_t random_number()
 }
 
 #define TABLE_SIZE 0x400000
+#define TABLE_MASK 0x3FFFFF
 
 #define EXACT 0
-#define ALPHA 1
-#define BETA 2
-typedef struct HashEntry
-{
+#define LOWERBOUND 1
+#define UPPERBOUND 2
+typedef struct HashEntry {
     uint64_t key;
     int depth;
     int flag;
@@ -223,7 +180,34 @@ typedef struct HashEntry
 } HashEntry;
 
 extern HashEntry table[TABLE_SIZE];
-static inline HashEntry *search_table(uint64_t key) { return &table[key % TABLE_SIZE]; };
-void insert_table(HashEntry *entry, uint64_t key, int depth, int flag, int score, Move move);
+static inline HashEntry *search_table(uint64_t key) { return &table[key & TABLE_MASK]; };
+
+#define EPT 0xFF
+typedef struct PieceTracker {
+    uint8_t positions[13];
+    uint8_t board_idx_position[120];
+} PieceTracker;
+extern PieceTracker piece_trackers[2];
+
+static inline uint8_t get_board_index(enum Player player, uint8_t pos_idx) { return piece_trackers[player].positions[pos_idx]; }
+static inline uint8_t get_position_index(enum Player player, uint8_t board_idx) { return piece_trackers[player].board_idx_position[board_idx]; }
+static inline void update_piece_tracker(enum Player player, uint8_t old_board_idx, uint8_t new_board_idx) {
+    uint8_t pos_idx = get_position_index(player, old_board_idx);
+    piece_trackers[player].positions[pos_idx] = new_board_idx;
+    piece_trackers[player].board_idx_position[old_board_idx] = EPT;
+    piece_trackers[player].board_idx_position[new_board_idx] = pos_idx;
+}
+static inline void remove_from_piece_tracker(enum Player player, uint8_t board_idx) {
+    uint8_t pos_idx = get_position_index(player, board_idx);
+    piece_trackers[player].positions[pos_idx] = EPT;
+    piece_trackers[player].board_idx_position[board_idx] = EPT;
+}
+static inline void add_to_piece_tracker(enum Player player, uint8_t board_idx) {
+    uint8_t pos_idx = 0;
+    while (piece_trackers[player].positions[pos_idx] != EPT)
+        pos_idx++;
+    piece_trackers[player].positions[pos_idx] = board_idx;
+    piece_trackers[player].board_idx_position[board_idx] = pos_idx;
+}
 
 #endif // KHET_LIB_H_INCLUDED

data/lib/khetai/version.rb

@@ -1,3 +1,3 @@
 module KhetAI
-  VERSION = "0.2.3"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: khetai
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.2
 platform: ruby
 authors:
 - jkugs
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-11-05 00:00:00.000000000 Z
+date: 2024-12-07 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -18,6 +18,7 @@ extensions:
 - ext/khetai/extconf.rb
 extra_rdoc_files: []
 files:
+- ".clang-format"
 - ".gitignore"
 - Gemfile
 - Gemfile.lock