qi 7.0.0 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18ca7bb7fca15a8ce854e8a205160b05a14127970039a904c3ce8ad6f8baf8fc
-  data.tar.gz: fc4b915c93488f39835f762b1f89fb44a74ab25ca3faa47fb4a6ea846db66c77
+  metadata.gz: eb79c3951884c03bb69f5b570c776e6154181b2e9c780a568faeb37b079b749e
+  data.tar.gz: 180ff6505865b89be300c3f3fbdc99d1f945d49f2469e73c6c3b28ad2cedd3f0
 SHA512:
-  metadata.gz: 6079a5cb3f9b5b83a5bbc0db41694e6037a46a8e5ef6ce8bd4e65f36863d17008cb5d08d806681c4b17daff89ef2d43abd4e260c4ba068b7ac499fe51a36053c
-  data.tar.gz: 164bb2211d24d9119061a9c771438d0b77f96c0e2d51d4f18c3cfe3f82acdeaf50bd532d4eafb071441a64a18be68cefc9bae9a6dcfcf81b633cf3498912e76c
+  metadata.gz: 6e1281cc8424faee3b9be0be0842b816aa824595e3f9e62e54c0bb0949dcf1671ce942bfb47bf5ffcb78abdff03dd11de723b3dba58256570b33b83fad6545a9
+  data.tar.gz: e3b0c8103baa427ff22f770c6afc70eef6c5251fee580864c23129c264ea5534528dd365099fa9f5e4bf2b9f5d8d4762094e6bf771bab2acde4eeeeee795d680

data/README.md

@@ -30,20 +30,16 @@ require "qi"
 
 Qi.call(
   [43, 13, "+B"],
-  "side_id": 0,
-  "board": {
+  *%w[S r r b g g g g s n n n n p p p p p p p p p p p p p p p p p],
+  **{
      3 => "s",
      4 => "k",
      5 => "s",
     22 => "+P",
     43 => "+B"
-  },
-  "hands": [
-    %w[S],
-    %w[r r b g g g g s n n n n p p p p p p p p p p p p p p p p p]
-  ]
+  }
 )
-# => {:side_id=>1, :board=>{3=>"s", 4=>"k", 5=>"s", 22=>"+P", 13=>"+B"}, :hands=>[["S"], ["r", "r", "b", "g", "g", "g", "g", "s", "n", "n", "n", "n", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p"]]}
+# => {:square=>{3=>"s", 4=>"k", 5=>"s", 22=>"+P", 13=>"+B"}, :in_hand=>["S", "r", "r", "b", "g", "g", "g", "g", "s", "n", "n", "n", "n", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p"]}
 ```
 
 ## License

data/lib/qi.rb

@@ -5,54 +5,42 @@
 # @example
 #   Qi.call(
 #     [43, 13, "+B"],
-#     "side_id": 0,
-#     "board": {
+#     "in_hand": %w[S r r b g g g g s n n n n p p p p p p p p p p p p p p p p p],
+#     "square": {
 #        3 => "s",
 #        4 => "k",
 #        5 => "s",
 #       22 => "+P",
 #       43 => "+B"
-#     },
-#     "hands": [
-#       %w[S],
-#       %w[r r b g g g g s n n n n p p p p p p p p p p p p p p p p p]
-#     ]
+#     }
 #   )
-#   # => {:side_id=>1, :board=>{3=>"s", 4=>"k", 5=>"s", 22=>"+P", 13=>"+B"}, :hands=>[["S"], ["r", "r", "b", "g", "g", "g", "g", "s", "n", "n", "n", "n", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p"]]}
+#   # => {:in_hand=>["S", "r", "r", "b", "g", "g", "g", "g", "s", "n", "n", "n", "n", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p"], :square=>{3=>"s", 4=>"k", 5=>"s", 22=>"+P", 13=>"+B"}}
 module Qi
   # Apply a move to the position.
   #
   # @param move [Array] The move to play.
-  # @param side_id [Integer] The identifier of the player who must play.
-  # @param board [Hash] The indexes of each piece on the board.
-  # @param hands [Array] The list of pieces in hand grouped by players.
+  # @param in_hand [Array] The list of pieces in hand.
+  # @param square [Hash] The index of each piece on the board.
   #
   # @see https://developer.sashite.com/specs/portable-chess-notation
   # @see https://developer.sashite.com/specs/portable-move-notation
   #
-  # @example
+  # @example A classic Shogi problem
   #   call(
   #     [43, 13, "+B"],
-  #     "side_id": 0,
-  #     "board": {
+  #     *%w[S r r b g g g g s n n n n p p p p p p p p p p p p p p p p p],
+  #     **{
   #        3 => "s",
   #        4 => "k",
   #        5 => "s",
   #       22 => "+P",
   #       43 => "+B"
-  #     },
-  #     "hands": [
-  #       %w[S],
-  #       %w[r r b g g g g s n n n n p p p p p p p p p p p p p p p p p]
-  #     ]
+  #     }
   #   )
-  #   # => {:side_id=>1, :board=>{3=>"s", 4=>"k", 5=>"s", 22=>"+P", 13=>"+B"}, :hands=>[["S"], ["r", "r", "b", "g", "g", "g", "g", "s", "n", "n", "n", "n", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p"]]}
+  #   # => {:in_hand=>["S", "r", "r", "b", "g", "g", "g", "g", "s", "n", "n", "n", "n", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p"], :square=>{3=>"s", 4=>"k", 5=>"s", 22=>"+P", 13=>"+B"}}
   #
   # @return [Hash] The next position.
-  def self.call(move, side_id:, board:, hands:)
-    updated_board = board.dup
-    updated_in_hand_pieces = hands.fetch(side_id).dup
-
+  def self.call(move, *in_hand, **square)
     actions = move.each_slice(4)
 
     actions.each do |action|
@@ -62,23 +50,19 @@ module Qi
       captured_piece_name = action.fetch(3, nil)
 
       if src_square_id.nil?
-        piece_in_hand_id = updated_in_hand_pieces.index(moved_piece_name)
-        updated_in_hand_pieces.delete_at(piece_in_hand_id) unless piece_in_hand_id.nil?
+        piece_in_hand_id = in_hand.index(moved_piece_name)
+        in_hand.delete_at(piece_in_hand_id) unless piece_in_hand_id.nil?
       else
-        updated_board.delete(src_square_id)
+        square.delete(src_square_id)
       end
 
-      updated_board[dst_square_id] = moved_piece_name
-      updated_in_hand_pieces.push(captured_piece_name) unless captured_piece_name.nil?
+      square[dst_square_id] = moved_piece_name
+      in_hand.push(captured_piece_name) unless captured_piece_name.nil?
     end
 
-    updated_hands = hands.dup
-    updated_hands[side_id] = updated_in_hand_pieces
-
     {
-      side_id: side_id.succ % hands.length,
-      board: updated_board,
-      hands: updated_hands
+      in_hand: in_hand,
+      square: square
     }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qi
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 8.0.0
 platform: ruby
 authors:
 - Cyril Kato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-19 00:00:00.000000000 Z
+date: 2020-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brutal