chess 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72831c5ff5567709d9ce1e377c98d7867b35b611
-  data.tar.gz: 0af6a358a253414ad636d9fec050eb1dd5ccfbc9
+  metadata.gz: 144e0056d416422439a212c961f1a20f97899732
+  data.tar.gz: 8863ebc0662c3e8a9358df006302a41e2f4a1782
 SHA512:
-  metadata.gz: cf1c0fc216c2e2a76e978b96c4e668eed29d23eef23606280075b58d42a717b27d1fdfe50c1dae6961ffac71d4272ada39c6a3f8a8e2b69d5b16a33c24114abe
-  data.tar.gz: 3544641ba2184d3965574c912472defad0e49020c650ae9f2a342683dddd02b81ced292156c3828d987b6001f5e8993a252c4950bc56bd965de827d5f858e03e
+  metadata.gz: 859d042dbca0d119161bd0361dc9940dadc0e9de3b60e863ec9609425f6b8487f70bbd5821de98d67096c96cf46d6ada82ce59dba7a8e3963aba47fb3c0d29f0
+  data.tar.gz: 7466a2c6711067f3e90efb80ec5a7a64ca3c323cdd4d2ba087959ef93f04a54778fcd36d4cec537f962b9fc4d80aa726593febf857cf8588c791088ead57775c

data/ext/board.c

@@ -472,7 +472,9 @@ try_move (Board *board, int from, int to, char promote_in, Board *new_board, cha
   return TRUE;
 }
 
-// Returns the short algebraic chess notation of the move from-to.
+// Returns the short algebraic chess notation of the move from-to. Do not
+// perform the check to add mate symbols like '+' or '#'. This check is done on
+// `apply_move` method.
 char*
 get_notation (Board *board, int from, int to, int capture, int ep, char promotion, int check, int checkmate)
 {
@@ -523,6 +525,13 @@ get_notation (Board *board, int from, int to, int capture, int ep, char promotio
                     }
                 }
             }
+          // Swap file and rank disambiguating char if number is before the letter.
+          if (disc_file_added && disc_rank_added && notation[i-2] < notation[i-1])
+            {
+              int tmp = notation[i-2];
+              notation[i-2] = notation[i-1];
+              notation[i-1] = tmp;
+            }
         }
     }
   if (capture || ep)

data/ext/chess.c

@@ -602,6 +602,44 @@ board_fullmove_number (VALUE self)
   return INT2FIX (board->fullmove_number);
 }
 
+/*
+ * @overload generate_moves(square)
+ *   Generate all legal moves for the piece in `square` position.
+ *   @param [Integer,String] square The square of the {Board}. Can be an integer
+ *     between 0 and 63 or a string like 'a2', 'c5'...
+ *   @return [Array<String>] Returns all legal moves that the piece in `square`
+ *     position can perform. The moves are in short algebraic chess notation
+ *     format.
+ *   @example
+ *     :001 > g = Chess::Game.new
+ *      => #<Chess::Game:0x007f88a529fa88>
+ *     :002 > g.board.generate_moves('b1')
+ *      => ["Na3", "Nc3"]
+ */
+VALUE
+board_generate_moves (VALUE self, VALUE square)
+{
+  Board *board;
+  Data_Get_Struct (self, Board, board);
+  int from;
+  if (TYPE (square) == T_STRING)
+    from = coord_to_square (StringValuePtr (square));
+  else
+    from = FIX2INT (square);
+  VALUE moves = rb_ary_new ();
+  Board new_board;
+  char *move_done;
+  char capture;
+  for (int i = 0; i < 64; i++)
+    if (pseudo_legal_move (board, from, i))
+      {
+        move_done = castling (board, castling_type (board, from, i), &new_board);
+        if (move_done || try_move (board, from, i, 'Q', &new_board, &move_done, &capture))
+          rb_ary_push (moves, rb_str_new2 (move_done));
+      }
+  return moves;
+}
+
 /*
  * @overload to_fen
  *   Returns the FEN string of the board.
@@ -689,6 +727,7 @@ Init_chess ()
   rb_define_method (board_klass, "active_color", board_active_color, 0);
   rb_define_method (board_klass, "halfmove_clock", board_halfmove_clock, 0);
   rb_define_method (board_klass, "fullmove_number", board_fullmove_number, 0);
+  rb_define_method (board_klass, "generate_moves", board_generate_moves, 1);
   rb_define_method (board_klass, "to_fen", board_to_fen, 0);
   rb_define_method (board_klass, "to_s", board_to_s, 0);
 

data/ext/chess.h

@@ -41,6 +41,7 @@ VALUE board_fifty_move_rule (VALUE self);
 VALUE board_active_color (VALUE self);
 VALUE board_halfmove_clock (VALUE self);
 VALUE board_fullmove_number (VALUE self);
+VALUE board_generate_moves (VALUE self, VALUE square);
 VALUE board_to_fen (VALUE self);
 VALUE board_to_s (VALUE self);
 

data/ext/game.c

@@ -67,7 +67,7 @@ current_move (Game *g)
 {
   if (g->current > 0)
     return g->moves[g->current-1];
-  return 0;
+  return NULL;
 }
 
 // Returns the last move done in coordinate format.

data/ext/special.c

@@ -95,10 +95,10 @@ castling (Board *board, int castling_type, Board *new_board)
       memcpy (new_board, board, sizeof (Board));
       new_board->king[WHITE] ^= 0x50;
       new_board->rooks[WHITE] ^= 0xa0;
-      new_board->placement[E1] = 0;
+      new_board->placement[E1] = '\0';
       new_board->placement[F1] = 'R';
       new_board->placement[G1] = 'K';
-      new_board->placement[H1] = 0;
+      new_board->placement[H1] = '\0';
       new_board->castling ^= new_board->castling & 0x1100;
       move = (char *) malloc (5);
       strcpy (move, "O-O");
@@ -107,10 +107,10 @@ castling (Board *board, int castling_type, Board *new_board)
       memcpy (new_board, board, sizeof (Board));
       new_board->king[WHITE] ^= 0x14;
       new_board->rooks[WHITE] ^= 0x09;
-      new_board->placement[E1] = 0;
+      new_board->placement[E1] = '\0';
       new_board->placement[D1] = 'R';
       new_board->placement[C1] = 'K';
-      new_board->placement[A1] = 0;
+      new_board->placement[A1] = '\0';
       new_board->castling ^= new_board->castling & 0x1100;
       move = (char *) malloc (7);
       strcpy (move, "O-O-O");
@@ -119,10 +119,10 @@ castling (Board *board, int castling_type, Board *new_board)
       memcpy (new_board, board, sizeof (Board));
       new_board->king[BLACK] ^= 0x5000000000000000;
       new_board->rooks[BLACK] ^= 0xa000000000000000;
-      new_board->placement[E8] = 0;
+      new_board->placement[E8] = '\0';
       new_board->placement[F8] = 'r';
       new_board->placement[G8] = 'k';
-      new_board->placement[H8] = 0;
+      new_board->placement[H8] = '\0';
       new_board->castling ^= new_board->castling & 0x0011;
       move = (char *) malloc (5);
       strcpy (move, "O-O");
@@ -131,16 +131,16 @@ castling (Board *board, int castling_type, Board *new_board)
       memcpy (new_board, board, sizeof (Board));
       new_board->king[BLACK] ^= 0x1400000000000000;
       new_board->rooks[BLACK] ^= 0x0900000000000000;
-      new_board->placement[E8] = 0;
+      new_board->placement[E8] = '\0';
       new_board->placement[D8] = 'r';
       new_board->placement[C8] = 'k';
-      new_board->placement[A8] = 0;
+      new_board->placement[A8] = '\0';
       new_board->castling ^= new_board->castling & 0x0011;
       move = (char *) malloc (7);
       strcpy (move, "O-O-O");
       break;
     default:
-      return 0;
+      return NULL;
     }
   set_occupied (new_board);
   return move;

data/lib/chess/version.rb

@@ -1,5 +1,5 @@
 # The Chess library module.
 module Chess
   # The library version.
-  VERSION = '0.1.4'
+  VERSION = '0.2.0'
 end

data/test/test_move_generator.rb

@@ -0,0 +1,29 @@
+require 'test_helper'
+
+class ChessTest < Minitest::Test
+
+  GENS = {
+    'r2qk3/8/2n5/8/8/8/p2B4/4K2R w K - 0 1' => {'e1' => ['Kd1', 'Ke2', 'Kf2', 'Kf1', 'O-O']},
+    'r2qk3/8/2n5/8/8/8/p2B4/4K2R w - - 0 1' => {'e1' => ['Kd1', 'Ke2', 'Kf2', 'Kf1']},
+    'r2qk3/8/2n5/2b5/8/8/p2B4/4K2R w K - 0 1' => {'e1' => ['Kd1', 'Ke2', 'Kf1']},
+    'r2qk3/8/2n5/2b5/8/8/p2B4/4K2R b K - 0 1' => {'a2' => ['a1=Q']},
+    'r2qk3/8/2n1n3/2b5/8/8/p2B4/4K2R b K - 0 1' => {'e6' => ['Nf8', 'Ng7', 'Ng5', 'Nf4', 'Ned4', 'Nc7']},
+    'r2qk3/8/2n5/2b2pP1/8/8/3B4/4K2R w K f6 0 1' => {'g5' => ['gxf6ep', 'g6']},
+    '1B1k4/r3q3/2n1n3/2b2pP1/8/1n6/3B4/4K2R b K - 0 1' => {'c6' => ['Nxb8', 'Ne5', 'Ncd4', 'Nb4', 'Nca5']},
+    '1B1k4/r3q3/2n1n3/2b2pP1/8/8/2nB4/3K3R b - - 0 1' => {'c6' => ['Nxb8', 'Ne5', 'Nc6d4', 'N6b4', 'Na5']},
+    '1B1k4/r3q3/2n1n2P/2b5/5p2/3p1RP1/3B4/3K4 w - - 0 1' => {'f3' => ['Rxd3', 'Re3', 'Rxf4', 'Rf2', 'Rf1']},
+    'k7/1Q6/2P5/8/8/8/8/3K4 b - - 0 1' => {'a8' => []},
+    'k7/6P1/8/8/8/3r4/3Q4/3K4 w - - 0 1' => {'d2' => ['Qxd3']}
+  }
+
+  GENS.each do |fen, generators|
+    define_method("test_move_generator_#{fen}") do
+      game = Chess::Game.load_fen(fen)
+      generators.each do |from, moves|
+        result = game.board.generate_moves(from)
+        assert_equal moves.sort, result.sort
+      end
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chess
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Enrico Pilotto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-16 00:00:00.000000000 Z
+date: 2017-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -1315,6 +1315,7 @@ files:
 - test/test_illegal_moves.rb
 - test/test_insufficient_material.rb
 - test/test_load_fen.rb
+- test/test_move_generator.rb
 - test/test_particular_situations.rb
 - test/test_pgn.rb
 - test/test_pgn_collection.rb
@@ -2559,6 +2560,7 @@ test_files:
 - test/test_illegal_moves.rb
 - test/test_insufficient_material.rb
 - test/test_load_fen.rb
+- test/test_move_generator.rb
 - test/test_particular_situations.rb
 - test/test_pgn.rb
 - test/test_pgn_collection.rb