khetai 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1883bbf3758483b6771f1fce6c7ff1c9bc6625a88035ca57f71efb7e03b25e9d
-  data.tar.gz: 62a0eb4c822754885c6e92d4ad07a78301e6d566b2f804e4fb03db31f4192a6a
+  metadata.gz: d169f4a004e24dd36c20cc0483e97089288c37d9a883102902e57ad90b9da52c
+  data.tar.gz: 4220a784bde8231944b7cd856839f651c7b7d0491748e6597a1d6a94c58c468d
 SHA512:
-  metadata.gz: bcd3d8db78079c7373a228f53408444341d43f5abbc96402d5775cd3f379554b3790152bd7dc1d17604d956dcf2d07329149098a89f6d54df94222f4a6b6c637
-  data.tar.gz: c1e1ca8ce28b5e690720de15a32af6938970ad6b86fa759bd8cee1f101f8d607642f0d05b6861f8507794e3950e69a03cd76797121d3038ec19193fda36ba6cf
+  metadata.gz: 74a55ef185db9d73c58e9e148a3e124f5850da6304be611d7466d8951e43b6d3165e9fbf5ae98654c12861a49e3281bf6a299f03f0b55e9d63ee51c6b76d2793
+  data.tar.gz: 6409ac627699d0daa5a7cacb4ce1da174be6f433228466b7cd0ffd04e7c47d9830f11de41e629313b38b776dd7a41647aa82e405f49dc18d69e03f23a14a8f65

data/Gemfile.lock

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

data/README.md

@@ -51,16 +51,20 @@ The internals of the gem are written in C, located in `ext/khetai`.
     $ bundle exec rake build
     $ gem install pkg/khetai-<version>.gem
 
+Once tested and verified, bump the version number in `lib/khetai/version.rb` and commit changes.
 
 To release and push to rubygems.org:
 
     $ bundle exec rake release
+
+To push a pre-built gem manually:
+
     $ gem push pkg/<gem>
 
 ## Manual Testing
 
-There is a GUI test harness written in C++ using FLTK available in the `ext/khetai/dev/fltk-ui` directory.
+There is a GUI test harness written in C++ using FLTK available in the [ext/khetai/dev/fltk-ui](/ext/khetai/dev/fltk-ui) directory.
 
 ### Why does this exist?
 
-To learn, build, and have fun.
+As something to work on and learn from.

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

@@ -52,6 +52,11 @@ void (*AILoader::get_init_zobrist())()
     return reinterpret_cast<void (*)()>(get_symbol("init_zobrist"));
 }
 
+void (*AILoader::get_reset_undo())()
+{
+    return reinterpret_cast<void (*)()>(get_symbol("reset_undo"));
+}
+
 void (*AILoader::get_setup_board())(char **)
 {
     return reinterpret_cast<void (*)(char **)>(get_symbol("setup_board"));

data/ext/khetai/dev/fltk-ui/ai_loader.h

@@ -13,6 +13,7 @@ public:
     ~AILoader();
 
     void (*get_init_zobrist())();
+    void (*get_reset_undo())();
     void (*get_setup_board())(char **);
     void (*get_print_board())();
     void (*get_set_time_parameters())(int, time_t);

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

@@ -54,6 +54,7 @@ void free_c_array(char **c_array, size_t size)
 Move call_ai_move(AILoader &ai_loader, const std::vector<std::vector<std::string>> &board_pieces, Player player, int max_depth, int max_time)
 {
     auto init_zobrist = ai_loader.get_init_zobrist();
+    auto reset_undo = ai_loader.get_reset_undo();
     auto setup_board = ai_loader.get_setup_board();
     auto print_board = ai_loader.get_print_board();
     auto set_time_parameters = ai_loader.get_set_time_parameters();
@@ -65,6 +66,7 @@ Move call_ai_move(AILoader &ai_loader, const std::vector<std::vector<std::string
 
     char **c_board = vector_to_c_array(flatten_2d_vector_with_buffer(board_pieces));
 
+    reset_undo();
     init_zobrist();
     srand((unsigned)time(NULL));
 

data/ext/khetai/khetai.c

@@ -40,7 +40,7 @@ VALUE move(VALUE self, VALUE board_array, VALUE _player, VALUE _max_depth, VALUE
         VALUE element = rb_ary_entry(board_array, i);
         if (!RB_TYPE_P(element, T_STRING) || RSTRING_LEN(element) != 2)
         {
-            rb_raise(rb_eArgError, "each element in the board_array must be 2 characters");
+            rb_raise(rb_eArgError, "each element in board_array must be 2 characters");
         }
 
         // check if element in board_array is a valid string
@@ -56,7 +56,7 @@ VALUE move(VALUE self, VALUE board_array, VALUE _player, VALUE _max_depth, VALUE
         }
         if (!is_valid)
         {
-            rb_raise(rb_eArgError, "each element in the board_array must be a valid piece (example: 'p1') or empty ('--')");
+            rb_raise(rb_eArgError, "each element in board_array must be a valid piece (example: 'p1') or empty ('--')");
         }
     }
 

data/ext/khetai/khetai_lib.c

@@ -11,6 +11,7 @@ Square board[120] = {0};
 int pharaoh_loc[2] = {0};
 enum Player whose_turn;
 enum Player starter;
+int initial_depth = 0;
 
 Move undo_moves[MAX_DEPTH] = {0};
 int undo_capture_indices[MAX_DEPTH] = {0};
@@ -29,6 +30,7 @@ Move alphabeta_root(int depth, enum Player player)
 {
     whose_turn = player;
     starter = player;
+    initial_depth = depth;
     int best_score = -MAX_SCORE;
     Move best_move = (Move)0;
     int alpha = -MAX_SCORE;
@@ -71,8 +73,10 @@ int alphabeta(int depth, enum Player player, int alpha, int beta)
     int alpha_orig = alpha;
     Move valid_moves[NUM_VALID_MOVES] = {0};
     int vi = 0;
+
+    int table_depth = initial_depth - depth;
     HashEntry *entry = search_table(hashes[move_num]);
-    if (entry->key == hashes[move_num] && entry->depth >= depth)
+    if (entry->key == hashes[move_num] && entry->depth > table_depth)
     {
         if (entry->flag == EXACT)
             return entry->score;
@@ -123,19 +127,19 @@ int alphabeta(int depth, enum Player player, int alpha, int beta)
     else if (best_score >= beta)
         flag = ALPHA;
 
-    insert_table(hashes[move_num], depth, flag, best_score, best_move);
+    
+    insert_table(entry, hashes[move_num], table_depth, flag, best_score, best_move);
     return best_score;
 }
 
-void insert_table(uint64_t key, int depth, int flag, int score, Move move)
+void insert_table(HashEntry *entry, uint64_t key, int table_depth, int flag, int score, Move move)
 {
-    HashEntry *entry = search_table(key);
     if (entry->key != 0)
     {
-        if (depth < entry->depth)
+        if (table_depth > entry->depth)
         {
             entry->key = key;
-            entry->depth = depth;
+            entry->depth = table_depth;
             entry->flag = flag;
             entry->score = score;
             entry->move = move;
@@ -144,7 +148,7 @@ void insert_table(uint64_t key, int depth, int flag, int score, Move move)
     else
     {
         entry->key = key;
-        entry->depth = depth;
+        entry->depth = table_depth;
         entry->flag = flag;
         entry->score = score;
         entry->move = move;
@@ -154,7 +158,7 @@ void insert_table(uint64_t key, int depth, int flag, int score, Move move)
 int calculate_score()
 {
     int score = 0;
-    int anubis_score = 500;
+    int anubis_score = 800;
     int pyramid_score = 1000;
     int pharaoh_score = 100000;
     for (int i = 0; i < 120; i++)
@@ -467,6 +471,7 @@ void reset_undo()
 
 void setup_board(char *init_board[120])
 {
+    move_num = 0;
     uint64_t hash = 0;
     for (int i = 0; i < 120; i++)
     {

data/ext/khetai/khetai_lib.h

@@ -38,6 +38,7 @@ enum Orientation
 
 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)};
@@ -223,6 +224,6 @@ typedef struct HashEntry
 
 extern HashEntry table[TABLE_SIZE];
 static inline HashEntry *search_table(uint64_t key) { return &table[key % TABLE_SIZE]; };
-void insert_table(uint64_t key, int depth, int flag, int score, Move move);
+void insert_table(HashEntry *entry, uint64_t key, int depth, int flag, int score, Move move);
 
 #endif // KHET_LIB_H_INCLUDED

data/lib/khetai/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: khetai
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - jkugs
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-10-17 00:00:00.000000000 Z
+date: 2024-11-05 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: