qi 6.1.1 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d85f0a7a03ecc612c24bf29363b843fb88fa0572b8f74bf955eb92039314a54
-  data.tar.gz: ee40f146832333bf952ba810d1d95fafeabc8e6dc17905e39310b7c746faeb5f
+  metadata.gz: eb79c3951884c03bb69f5b570c776e6154181b2e9c780a568faeb37b079b749e
+  data.tar.gz: 180ff6505865b89be300c3f3fbdc99d1f945d49f2469e73c6c3b28ad2cedd3f0
 SHA512:
-  metadata.gz: 1310f61417a533fb3c6f19350b759f1831d1b9e7afc04ac4946ac36850cd53eea5ed27942af0f9132d93871047f888217f265d6db782e2d153453ec34c4c80fd
-  data.tar.gz: a2c2ca62646b82063b132d69a2f5fc15b062500a23daa6c5953154b23c798fdbbe9c4c6d4f3406be8b01b07c9737a0570c4d6fa0c27f69021c41a4fba79abb3d
+  metadata.gz: 6e1281cc8424faee3b9be0be0842b816aa824595e3f9e62e54c0bb0949dcf1671ce942bfb47bf5ffcb78abdff03dd11de723b3dba58256570b33b83fad6545a9
+  data.tar.gz: e3b0c8103baa427ff22f770c6afc70eef6c5251fee580864c23129c264ea5534528dd365099fa9f5e4bf2b9f5d8d4762094e6bf771bab2acde4eeeeee795d680

data/README.md

@@ -5,14 +5,14 @@
 [![Inline docs](https://inch-ci.org/github/sashite/qi.rb.svg?branch=master)][inchpages]
 [![Documentation](https://img.shields.io/:yard-docs-38c800.svg)][rubydoc]
 
-> `Qi` (棋) is an abstraction for initializing and updating positions of chess variants (including Chess, Janggi, Markruk, Shogi, Xiangqi).
+> `Qi` (棋) is an abstraction for updating positions of chess variants (including Chess, Janggi, Markruk, Shogi, Xiangqi), with a move.
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'qi'
+gem "qi"
 ```
 
 And then execute:
@@ -25,128 +25,21 @@ Or install it yourself as:
 
 ## Examples
 
-Let's replay [The Shortest Possible Game of Shogi](https://userpages.monmouth.com/~colonel/shortshogi.html):
-
-```ruby
-require 'qi'
-
-starting_position = Qi::Position.new(
-  'l', 'n', 's', 'g', 'k', 'g', 's', 'n', 'l',
-  nil, 'r', nil, nil, nil, nil, nil, 'b', nil,
-  'p', 'p', 'p', 'p', 'p', 'p', 'p', 'p', 'p',
-  nil, nil, nil, nil, nil, nil, nil, nil, nil,
-  nil, nil, nil, nil, nil, nil, nil, nil, nil,
-  nil, nil, nil, nil, nil, nil, nil, nil, nil,
-  'P', 'P', 'P', 'P', 'P', 'P', 'P', 'P', 'P',
-  nil, 'B', nil, nil, nil, nil, nil, 'R', nil,
-  'L', 'N', 'S', 'G', 'K', 'G', 'S', 'N', 'L'
-)
-
-starting_position.topside_in_hand_pieces # => []
-starting_position.squares # => ["l", "n", "s", "g", "k", "g", "s", "n", "l",
-                          #     nil, "r", nil, nil, nil, nil, nil, "b", nil,
-                          #     "p", "p", "p", "p", "p", "p", "p", "p", "p",
-                          #     nil, nil, nil, nil, nil, nil, nil, nil, nil,
-                          #     nil, nil, nil, nil, nil, nil, nil, nil, nil,
-                          #     nil, nil, nil, nil, nil, nil, nil, nil, nil,
-                          #     "P", "P", "P", "P", "P", "P", "P", "P", "P",
-                          #     nil, "B", nil, nil, nil, nil, nil, "R", nil,
-                          #     "L", "N", "S", "G", "K", "G", "S", "N", "L"]
-starting_position.bottomside_in_hand_pieces # => []
-starting_position.in_hand_pieces # => []
-starting_position.turn_to_topside? # => false
-
-# List of moves in Portable Move Notation (https://developer.sashite.com/specs/portable-move-notation) format.
-moves = [
-  [ 56, 47, 'P' ],
-  [ 3, 11, 'g' ],
-  [ 64, 24, '+B', 'P' ],
-  [ 5, 14, 'g' ],
-  [ 24, 14, '+B', 'G' ],
-  [ 4, 3, 'k' ],
-  [ nil, 13, 'G' ]
-]
-
-last_position = moves.reduce(starting_position) do |position, move|
-  position.call(move)
-end
-
-last_position.topside_in_hand_pieces # => []
-last_position.squares # => ["l", "n", "s", "k", nil, nil, "s", "n", "l",
-                      #     nil, "r", "g", nil, "G", "+B", nil, "b", nil,
-                      #     "p", "p", "p", "p", "p", "p", nil, "p", "p",
-                      #     nil, nil, nil, nil, nil, nil, nil, nil, nil,
-                      #     nil, nil, nil, nil, nil, nil, nil, nil, nil,
-                      #     nil, nil, "P", nil, nil, nil, nil, nil, nil,
-                      #     "P", "P", nil, "P", "P", "P", "P", "P", "P",
-                      #     nil, nil, nil, nil, nil, nil, nil, "R", nil,
-                      #     "L", "N", "S", "G", "K", "G", "S", "N", "L"]
-last_position.bottomside_in_hand_pieces # => ["P"]
-last_position.in_hand_pieces # => []
-last_position.turn_to_topside? # => true
-```
-
-Another example with Xiangqi's Short Double Cannons Checkmate:
-
 ```ruby
-require 'qi'
-
-starting_position = Qi::Position.new(
-  '車', '馬', '象', '士', '將', '士', '象', '馬', '車',
-  nil, nil, nil, nil, nil, nil, nil, nil, nil,
-  nil, '砲', nil, nil, nil, nil, nil, '砲', nil,
-  '卒', nil, '卒', nil, '卒', nil, '卒', nil, '卒',
-  nil, nil, nil, nil, nil, nil, nil, nil, nil,
-  nil, nil, nil, nil, nil, nil, nil, nil, nil,
-  '兵', nil, '兵', nil, '兵', nil, '兵', nil, '兵',
-  nil, '炮', nil, nil, nil, nil, nil, '炮', nil,
-  nil, nil, nil, nil, nil, nil, nil, nil, nil,
-  '俥', '傌', '相', '仕', '帥', '仕', '相', '傌', '俥'
+require "qi"
+
+Qi.call(
+  [43, 13, "+B"],
+  *%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"
+  }
 )
-
-starting_position.topside_in_hand_pieces # => []
-starting_position.squares # => ["車", "馬", "象", "士", "將", "士", "象", "馬", "車",
-                          #     nil, nil, nil, nil, nil, nil, nil, nil, nil,
-                          #     nil, "砲", nil, nil, nil, nil, nil, "砲", nil,
-                          #     "卒", nil, "卒", nil, "卒", nil, "卒", nil, "卒",
-                          #     nil, nil, nil, nil, nil, nil, nil, nil, nil,
-                          #     nil, nil, nil, nil, nil, nil, nil, nil, nil,
-                          #     "兵", nil, "兵", nil, "兵", nil, "兵", nil, "兵",
-                          #     nil, "炮", nil, nil, nil, nil, nil, "炮", nil,
-                          #     nil, nil, nil, nil, nil, nil, nil, nil, nil,
-                          #     "俥", "傌", "相", "仕", "帥", "仕", "相", "傌", "俥"]
-starting_position.bottomside_in_hand_pieces # => []
-starting_position.in_hand_pieces # => []
-starting_position.turn_to_topside? # => false
-
-moves = [
-  [ 64, 67, '炮' ],
-  [ 25, 22, '砲' ],
-  [ 70, 52, '炮' ],
-  [ 19, 55, '砲' ],
-  [ 67, 31, '炮' ],
-  [ 22, 58, '砲' ],
-  [ 52, 49, '炮' ]
-]
-
-last_position = moves.reduce(starting_position) do |position, move|
-  position.call(move)
-end
-
-last_position.topside_in_hand_pieces # => []
-last_position.squares # => ["車", "馬", "象", "士", "將", "士", "象", "馬", "車",
-                      #     nil, nil, nil, nil, nil, nil, nil, nil, nil,
-                      #     nil, nil, nil, nil, nil, nil, nil, nil, nil,
-                      #     "卒", nil, "卒", nil, "炮", nil, "卒", nil, "卒",
-                      #     nil, nil, nil, nil, nil, nil, nil, nil, nil,
-                      #     nil, nil, nil, nil, "炮", nil, nil, nil, nil,
-                      #     "兵", "砲", "兵", nil, "砲", nil, "兵", nil, "兵",
-                      #     nil, nil, nil, nil, nil, nil, nil, nil, nil,
-                      #     nil, nil, nil, nil, nil, nil, nil, nil, nil,
-                      #     "俥", "傌", "相", "仕", "帥", "仕", "相", "傌", "俥"]
-last_position.bottomside_in_hand_pieces # => []
-last_position.in_hand_pieces # => []
-last_position.turn_to_topside? # => true
+# => {: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

@@ -1,7 +1,68 @@
 # frozen_string_literal: true
 
-# The Qi module.
+# The Qi abstraction.
+#
+# @example
+#   Qi.call(
+#     [43, 13, "+B"],
+#     "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"
+#     }
+#   )
+#   # => {: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
-end
+  # Apply a move to the position.
+  #
+  # @param move [Array] The move to play.
+  # @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 A classic Shogi problem
+  #   call(
+  #     [43, 13, "+B"],
+  #     *%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"
+  #     }
+  #   )
+  #   # => {: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, *in_hand, **square)
+    actions = move.each_slice(4)
+
+    actions.each do |action|
+      src_square_id       = action.fetch(0)
+      dst_square_id       = action.fetch(1)
+      moved_piece_name    = action.fetch(2)
+      captured_piece_name = action.fetch(3, nil)
+
+      if src_square_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
+        square.delete(src_square_id)
+      end
 
-require_relative 'qi/position'
+      square[dst_square_id] = moved_piece_name
+      in_hand.push(captured_piece_name) unless captured_piece_name.nil?
+    end
+
+    {
+      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: 6.1.1
+  version: 8.0.0
 platform: ruby
 authors:
 - Cyril Kato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-27 00:00:00.000000000 Z
+date: 2020-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brutal
@@ -117,7 +117,6 @@ files:
 - LICENSE.md
 - README.md
 - lib/qi.rb
-- lib/qi/position.rb
 homepage: https://developer.sashite.com/specs/
 licenses:
 - MIT
@@ -133,7 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -143,5 +142,5 @@ requirements: []
 rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: Represent positions and play moves.
+summary: Update positions with a move.
 test_files: []

data/lib/qi/position.rb

@@ -1,153 +0,0 @@
-# frozen_string_literal: true
-
-module Qi
-  # The position class.
-  #
-  # @see https://developer.sashite.com/specs/portable-chess-notation
-  class Position
-    # The list of squares of on the board.
-    #
-    # @!attribute [r] squares
-    #   @return [Array] The list of squares.
-    attr_reader :squares
-
-    # The list of pieces in hand owned by the bottomside player.
-    #
-    # @!attribute [r] bottomside_in_hand_pieces
-    #   @return [Array] The list of bottomside's pieces in hand.
-    attr_reader :bottomside_in_hand_pieces
-
-    # The list of pieces in hand owned by the topside player.
-    #
-    # @!attribute [r] topside_in_hand_pieces
-    #   @return [Array] The list of topside's pieces in hand.
-    attr_reader :topside_in_hand_pieces
-
-    # Initialize a position.
-    #
-    # @param squares [Array] The list of squares of on the board.
-    # @param is_turn_to_topside [Boolean] The player who must play.
-    # @param bottomside_in_hand_pieces [Array] The list of bottom-side's pieces in hand.
-    # @param topside_in_hand_pieces [Array] The list of top-side's pieces in hand.
-    #
-    # @example Chess's starting position
-    #   Position.new(
-    #     '♜', '♞', '♝', '♛', '♚', '♝', '♞', '♜',
-    #     '♟', '♟', '♟', '♟', '♟', '♟', '♟', '♟',
-    #     nil, nil, nil, nil, nil, nil, nil, nil,
-    #     nil, nil, nil, nil, nil, nil, nil, nil,
-    #     nil, nil, nil, nil, nil, nil, nil, nil,
-    #     nil, nil, nil, nil, nil, nil, nil, nil,
-    #     '♙', '♙', '♙', '♙', '♙', '♙', '♙', '♙',
-    #     '♖', '♘', '♗', '♕', '♔', '♗', '♘', '♖'
-    #   )
-    #
-    # @example Makruk's starting position
-    #   Position.new(
-    #     '♜', '♞', '♝', '♛', '♚', '♝', '♞', '♜',
-    #     nil, nil, nil, nil, nil, nil, nil, nil,
-    #     '♟', '♟', '♟', '♟', '♟', '♟', '♟', '♟',
-    #     nil, nil, nil, nil, nil, nil, nil, nil,
-    #     nil, nil, nil, nil, nil, nil, nil, nil,
-    #     '♙', '♙', '♙', '♙', '♙', '♙', '♙', '♙',
-    #     nil, nil, nil, nil, nil, nil, nil, nil,
-    #     '♖', '♘', '♗', '♔', '♕', '♗', '♘', '♖'
-    #   )
-    #
-    # @example Shogi's starting position
-    #   Position.new(
-    #     'l', 'n', 's', 'g', 'k', 'g', 's', 'n', 'l',
-    #     nil, 'r', nil, nil, nil, nil, nil, 'b', nil,
-    #     'p', 'p', 'p', 'p', 'p', 'p', 'p', 'p', 'p',
-    #     nil, nil, nil, nil, nil, nil, nil, nil, nil,
-    #     nil, nil, nil, nil, nil, nil, nil, nil, nil,
-    #     nil, nil, nil, nil, nil, nil, nil, nil, nil,
-    #     'P', 'P', 'P', 'P', 'P', 'P', 'P', 'P', 'P',
-    #     nil, 'B', nil, nil, nil, nil, nil, 'R', nil,
-    #     'L', 'N', 'S', 'G', 'K', 'G', 'S', 'N', 'L'
-    #   )
-    #
-    # @example Xiangqi's starting position
-    #   Position.new(
-    #     '車', '馬', '象', '士', '將', '士', '象', '馬', '車',
-    #     nil, nil, nil, nil, nil, nil, nil, nil, nil,
-    #     nil, '砲', nil, nil, nil, nil, nil, '砲', nil,
-    #     '卒', nil, '卒', nil, '卒', nil, '卒', nil, '卒',
-    #     nil, nil, nil, nil, nil, nil, nil, nil, nil,
-    #     nil, nil, nil, nil, nil, nil, nil, nil, nil,
-    #     '兵', nil, '兵', nil, '兵', nil, '兵', nil, '兵',
-    #     nil, '炮', nil, nil, nil, nil, nil, '炮', nil,
-    #     nil, nil, nil, nil, nil, nil, nil, nil, nil,
-    #     '俥', '傌', '相', '仕', '帥', '仕', '相', '傌', '俥'
-    #   )
-    def initialize(*squares, is_turn_to_topside: false, bottomside_in_hand_pieces: [], topside_in_hand_pieces: [])
-      @squares                    = squares
-      @is_turn_to_topside         = is_turn_to_topside
-      @bottomside_in_hand_pieces  = bottomside_in_hand_pieces
-      @topside_in_hand_pieces     = topside_in_hand_pieces
-
-      freeze
-    end
-
-    # Apply a move in PMN (Portable Move Notation) format.
-    #
-    # @param move [Array] The move to play.
-    # @see https://developer.sashite.com/specs/portable-move-notation
-    # @return [Position] The new position.
-    def call(move)
-      updated_squares = squares.dup
-      updated_bottomside_in_hand_pieces = bottomside_in_hand_pieces.dup
-      updated_topside_in_hand_pieces = topside_in_hand_pieces.dup
-
-      actions = move.each_slice(4)
-
-      actions.each do |action|
-        src_square_id       = action.fetch(0)
-        dst_square_id       = action.fetch(1)
-        moved_piece_name    = action.fetch(2)
-        captured_piece_name = action.fetch(3, nil)
-
-        if src_square_id.nil?
-          if turn_to_topside?
-            piece_in_hand_id = updated_topside_in_hand_pieces.index(moved_piece_name)
-            updated_topside_in_hand_pieces.delete_at(piece_in_hand_id)
-          else
-            piece_in_hand_id = updated_bottomside_in_hand_pieces.index(moved_piece_name)
-            updated_bottomside_in_hand_pieces.delete_at(piece_in_hand_id)
-          end
-        else
-          updated_squares[src_square_id] = nil
-        end
-
-        updated_squares[dst_square_id] = moved_piece_name
-
-        unless captured_piece_name.nil?
-          if turn_to_topside?
-            updated_topside_in_hand_pieces.push(captured_piece_name)
-          else
-            updated_bottomside_in_hand_pieces.push(captured_piece_name)
-          end
-        end
-      end
-
-      self.class.new(*updated_squares, is_turn_to_topside: !turn_to_topside?,
-                                       bottomside_in_hand_pieces: updated_bottomside_in_hand_pieces,
-                                       topside_in_hand_pieces: updated_topside_in_hand_pieces)
-    end
-
-    # The list of pieces in hand owned by the current player.
-    #
-    # @return [Array] Topside's pieces in hand if turn to topside, bottomside's
-    #   ones otherwise.
-    def in_hand_pieces
-      turn_to_topside? ? topside_in_hand_pieces : bottomside_in_hand_pieces
-    end
-
-    # The side who must play.
-    #
-    # @return [Boolean] True if it is turn to topside, false otherwise.
-    def turn_to_topside?
-      @is_turn_to_topside
-    end
-  end
-end