khetai 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c47fe1f761953801fa38ca71116b99e2a8aa96a67b0878a722674efdedbe3ca9
-  data.tar.gz: 9333855a0a63b63ec6a0e40dba571e2ef7423d496947c3344207468c86649135
+  metadata.gz: 397d91c1cb38ed6a3c61ef8132415e88c74fcd80c933b124b028515109c656a1
+  data.tar.gz: 24b234943d22a75d358a3c4caa5723469d6ee98665e710ecdcc981288b975f11
 SHA512:
-  metadata.gz: 3b54d3fcb018ab5ce843203e9abe4ad850ebf89aae61e47677f3f13bf3911a3f9b405aa76794ab61f62cbecf8db6c7b991ab282e8565452499106696b3f3cdce
-  data.tar.gz: 23bbe28c2875f9c7a8344e6c441554cabfa3ce4a0728a79941761169f9e36d97aaff4ac81354577a5696c7bd6908e14c5924af6c85a1eb7de2a2823c86f7ec7d
+  metadata.gz: 1bd6ceb6036f2a11bdce881f176ccccfe247d2884aa647b2da423b81cc3ff36120fa56fac338b4aacb55edcb2e11a4b722c85b3633c7c307e0419f0cf5b5bb07
+  data.tar.gz: ed3131f4fefe5bc2050a396bb39036b73782bbabc39756445806dbf6b07485a4503e119fcef4baaa491033d3c695bfde451efac6a9ca83aa5287197b0af18d55

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    khetai (0.3.0)
+    khetai (0.3.2)
 
 GEM
   remote: https://rubygems.org/

data/ext/khetai/dev/fltk-ui/game_board_util.cpp

@@ -96,14 +96,6 @@ Move call_ai_move(AILoader &ai_loader, const std::vector<std::vector<std::string
 }
 
 void get_row_col(int index, int &row, int &col) {
-    int border_width = 1;
-    int width_with_border = 10 + 2 * border_width;
-
-    int adjusted_index = index;
-
-    int row_with_border = adjusted_index / width_with_border;
-    int col_with_border = adjusted_index % width_with_border;
-
-    row = row_with_border - border_width;
-    col = col_with_border - border_width;
-}
+    row = (index / 12) - 1;
+    col = (index % 12) - 1;
+}

data/ext/khetai/khetai.c

@@ -3,6 +3,13 @@
 #include <stdlib.h>
 #include <time.h>
 
+static int convert_index(int i) {
+    int row = (i / 12) - 1;
+    int col = (i % 12) - 1;
+
+    return (row * 10) + col;
+}
+
 VALUE move(VALUE self, VALUE board_array, VALUE _player, VALUE _max_depth, VALUE _max_time) {
     // verify parameters
     int player = NUM2INT(_player);
@@ -90,8 +97,8 @@ VALUE move(VALUE self, VALUE board_array, VALUE _player, VALUE _max_depth, VALUE
     make_move(best_move);
 
     VALUE out = rb_ary_new2(3);
-    rb_ary_store(out, 0, INT2NUM(get_start(best_move)));
-    rb_ary_store(out, 1, INT2NUM(get_end(best_move)));
+    rb_ary_store(out, 0, INT2NUM(convert_index(get_start(best_move))));
+    rb_ary_store(out, 1, INT2NUM(convert_index(get_end(best_move))));
     rb_ary_store(out, 2, INT2NUM(get_rotation(best_move)));
 
     return out;

data/ext/khetai/khetai_lib.c

@@ -6,26 +6,43 @@
 int max_time;
 time_t start_time;
 
-Square board[120] = {0};
-int pharaoh_loc[2] = {0};
-enum Player whose_turn;
-enum Player starter;
-int initial_depth = 0;
+static Square board[120] = {0};
+static int pharaoh_loc[2] = {0};
+static enum Player whose_turn;
+static enum Player starter;
+static int initial_depth = 0;
 
-Move undo_moves[MAX_DEPTH] = {0};
-int undo_capture_indices[MAX_DEPTH] = {0};
-Square undo_capture_squares[MAX_DEPTH] = {0};
+static Move undo_moves[MAX_DEPTH] = {0};
+static int undo_capture_indices[MAX_DEPTH] = {0};
+static Square undo_capture_squares[MAX_DEPTH] = {0};
 
 PieceTracker piece_trackers[2] = {0};
 
 HashEntry table[TABLE_SIZE] = {0};
-uint64_t hashes[MAX_DEPTH] = {0};
-uint64_t keys[0xFF][120] = {0};
-uint64_t turn_key = 0;
-
-int undo_index = 0;
-int hashes_index = 0;
-bool checkmate = false;
+static uint64_t hashes[MAX_DEPTH] = {0};
+static uint64_t keys[0xFF][120] = {0};
+static uint64_t turn_key = 0;
+
+static int undo_index = 0;
+static int hashes_index = 0;
+static bool checkmate = false;
+
+static int alphabeta(int depth, enum Player player, int alpha, int beta);
+static void insert_table(HashEntry *entry, uint64_t key, int depth, int flag, int score, Move move);
+static int calculate_score(void);
+static int distance_from_pharaoh(int i, int p);
+static void fire_laser(uint64_t *hash);
+static void undo_move();
+static void find_valid_moves(Move *valid_moves, int *vi);
+static void find_valid_anubis_pyramid_moves(int i, Move *valid_moves, int *vi);
+static void find_valid_scarab_moves(int i, Move *valid_moves, int *vi);
+static void find_valid_pharaoh_moves(int i, Move *valid_moves, int *vi);
+static void find_valid_sphinx_moves(int i, Move *valid_moves, int *vi);
+static uint64_t get_board_hash();
+static void init_piece_trackers();
+static bool is_move_legal(Move move);
+static Square str_to_square(char *str);
+static void print_piece(Square s);
 
 Move alphabeta_root(int depth, enum Player player) {
     whose_turn = player;

data/ext/khetai/khetai_lib.h

@@ -34,23 +34,11 @@ enum Orientation {
     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,
@@ -105,23 +93,6 @@ void print_board();
 }
 #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); }
@@ -186,13 +157,6 @@ static const int reflections[4][5][4] = {
      {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 hashes_index;
-extern bool checkmate;
-
-uint64_t get_board_hash();
 static uint64_t seed = 1070372;
 static inline uint64_t random_number() {
     seed ^= seed >> 12;
@@ -201,7 +165,8 @@ static inline uint64_t random_number() {
     return seed * 0x2545F4914F6CDD1DLL;
 }
 
-#define TABLE_SIZE 0x3FFFFF
+#define TABLE_SIZE 0x400000
+#define TABLE_MASK 0x3FFFFF
 
 #define EXACT 0
 #define LOWERBOUND 1
@@ -215,8 +180,7 @@ 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 {
@@ -224,7 +188,6 @@ typedef struct PieceTracker {
     uint8_t board_idx_position[120];
 } PieceTracker;
 extern PieceTracker piece_trackers[2];
-void init_piece_trackers();
 
 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]; }

data/lib/khetai/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: khetai
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - jkugs
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-12-01 00:00:00.000000000 Z
+date: 2024-12-07 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: