qi 6.2.0 → 9.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8139006ba5fe335016cb13704d9a23e77b20a64a774cca7242fb9bc46860c520
-  data.tar.gz: 01715c0a65f8d4690f06797db4a97be1d81251cd053dfd842e937f23136faa00
+  metadata.gz: 80f30262bee5c02c0df18d00b03848331e9bc673980e88c1c1949f0ac6915ff7
+  data.tar.gz: eca221290986aef674784c4c2f840f8485ea89d7deb5b19075df883e05cf574a
 SHA512:
-  metadata.gz: ac73beb467897bf8bc8f210edd5891fffed38ee24326fe41fb043f5b0b9cf4b99104247a887496d5cfc51de150bae2e1c99c1e44033992f3f8dd2809006a33c4
-  data.tar.gz: 6ccad4356dd09aabc9925f6357e2af3c137fb425348fb08c7d99b1b13afd049b7c23f8627485d7a8d5089393832194eea98518d2ecb7a423bac8a6607f25a4a5
+  metadata.gz: 5945e941761301f153d6db897b710d9548e6c3a514f1edc61222773e9cbee15f4d28e5abf7d4b85f072b2fc3dc866d07489c6e8d42aabb3c7bc38be788b70092
+  data.tar.gz: fd96cf0829d263a9374e52992c61a2b97815f3c6431bee0373080dbdde85c1d0a62eb9e414e950d0bc9ee49ff5d44594f3286ae9996aec8f2a6725dcb0a9fbcb

data/README.md

@@ -5,7 +5,7 @@
 [![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
 
@@ -25,341 +25,21 @@ Or install it yourself as:
 
 ## Examples
 
-Let's replay [The Shortest Possible Game](https://userpages.monmouth.com/~colonel/shortshogi.html) of [Shogi](https://en.wikipedia.org/wiki/Shogi):
-
-```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.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.pieces_in_hand_grouped_by_sides
-# => [[], []]
-
-starting_position.active_side_id
-# => 0
-
-starting_position.feen(9, 9)
-# => "l,n,s,g,k,g,s,n,l/1,r,5,b,1/p,p,p,p,p,p,p,p,p/9/9/9/P,P,P,P,P,P,P,P,P/1,B,5,R,1/L,N,S,G,K,G,S,N,L 0 /"
-
-# List of moves (see https://github.com/sashite/pmn.rb)
-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.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.pieces_in_hand_grouped_by_sides
-# => [["P"], []]
-
-last_position.active_side_id
-# => 1
-
-last_position.feen(9, 9)
-# => "l,n,s,k,2,s,n,l/1,r,g,1,G,+B,1,b,1/p,p,p,p,p,p,1,p,p/9/9/2,P,6/P,P,1,P,P,P,P,P,P/7,R,1/L,N,S,G,K,G,S,N,L 1 P/"
-```
-
-A classic [Tsume Shogi](https://en.wikipedia.org/wiki/Tsume_shogi) problem:
-
-```ruby
-require "qi"
-
-starting_position = Qi::Position.new(
-  nil, nil, nil, "s", "k", "s", nil, nil, nil,
-  nil, nil, nil, nil, nil, nil, nil, nil, nil,
-  nil, nil, nil, nil, "+P", nil, nil, nil, nil,
-  nil, nil, nil, nil, nil, nil, nil, nil, nil,
-  nil, nil, nil, nil, nil, nil, nil, "+B", 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,
-  pieces_in_hand_grouped_by_sides: [
-    ["S"],
-    ["b", "g", "g", "g", "g", "n", "n", "n", "n", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "r", "r", "s"]
-  ]
-)
-
-starting_position.in_hand_pieces
-# => ["S"]
-
-starting_position.squares
-# => [nil, nil, nil, "s", "k", "s", nil, nil, nil,
-#     nil, nil, nil, nil, nil, nil, nil, nil, nil,
-#     nil, nil, nil, nil, "+P", nil, nil, nil, nil,
-#     nil, nil, nil, nil, nil, nil, nil, nil, nil,
-#     nil, nil, nil, nil, nil, nil, nil, "+B", 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.pieces_in_hand_grouped_by_sides
-# => [["S"], ["b", "g", "g", "g", "g", "n", "n", "n", "n", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "r", "r", "s"]]
-
-starting_position.active_side_id
-# => 0
-
-starting_position.feen(9, 9)
-# => "3,s,k,s,3/9/4,+P,4/9/7,+B,1/9/9/9/9 0 S/b,g,g,g,g,n,n,n,n,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,r,r,s"
-
-# List of moves (see https://github.com/sashite/pmn.rb)
-moves = [
-  [  43, 13, "+B" ],  [ 5, 13, "s", "b" ],
-  [ nil, 14,  "S" ]
-]
-
-last_position = moves.reduce(starting_position) do |position, move|
-  position.call(move)
-end
-
-last_position.in_hand_pieces
-# => ["b", "g", "g", "g", "g", "n", "n", "n", "n", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "r", "r", "s", "b"]
-
-last_position.squares
-# => [nil, nil, nil, "s", "k", nil, nil, nil, nil,
-#     nil, nil, nil, nil, "s", "S", nil, nil, nil,
-#     nil, nil, nil, nil, "+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, 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.pieces_in_hand_grouped_by_sides
-# => [[], ["b", "g", "g", "g", "g", "n", "n", "n", "n", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "r", "r", "s", "b"]]
-
-last_position.active_side_id
-# => 1
-
-last_position.feen(9, 9)
-# => "3,s,k,4/4,s,S,3/4,+P,4/9/9/9/9/9/9 1 /b,b,g,g,g,g,n,n,n,n,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,r,r,s"
-```
-
-Another example with [Xiangqi](https://en.wikipedia.org/wiki/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,
-  "俥", "傌", "相", "仕", "帥", "仕", "相", "傌", "俥"
+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"
+  }
 )
-
-starting_position.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.pieces_in_hand_grouped_by_sides
-# => [[], []]
-
-starting_position.active_side_id
-# => 0
-
-starting_position.feen(10, 9)
-# => "車,馬,象,士,將,士,象,馬,車/9/1,砲,5,砲,1/卒,1,卒,1,卒,1,卒,1,卒/9/9/兵,1,兵,1,兵,1,兵,1,兵/1,炮,5,炮,1/9/俥,傌,相,仕,帥,仕,相,傌,俥 0 /"
-
-# List of moves (see https://github.com/sashite/pmn.rb)
-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.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.pieces_in_hand_grouped_by_sides
-# => [[], []]
-
-last_position.active_side_id
-# => 1
-
-last_position.feen(10, 9)
-# => "車,馬,象,士,將,士,象,馬,車/9/9/卒,1,卒,1,炮,1,卒,1,卒/9/4,炮,4/兵,砲,兵,1,砲,1,兵,1,兵/9/9/俥,傌,相,仕,帥,仕,相,傌,俥 1 /"
-```
-
-Let's do some moves on a [Four-player chess](https://en.wikipedia.org/wiki/Four-player_chess) board:
-
-```ruby
-require "qi"
-
-starting_position = Qi::Position.new(
-  nil , nil , nil , "yR", "yN", "yB", "yK", "yQ", "yB", "yN", "yR", nil , nil , nil ,
-  nil , nil , nil , "yP", "yP", "yP", "yP", "yP", "yP", "yP", "yP", nil , nil , nil ,
-  nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , nil ,
-  "bR", "bP", nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , "gP", "gR",
-  "bN", "bP", nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , "gP", "gN",
-  "bB", "bP", nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , "gP", "gB",
-  "bK", "bP", nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , "gP", "gQ",
-  "bQ", "bP", nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , "gP", "gK",
-  "bB", "bP", nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , "gP", "gB",
-  "bN", "bP", nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , "gP", "gN",
-  "bR", "bP", nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , "gP", "gR",
-  nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , nil ,
-  nil , nil , nil , "rP", "rP", "rP", "rP", "rP", "rP", "rP", "rP", nil , nil , nil ,
-  nil , nil , nil , "rR", "rN", "rB", "rQ", "rK", "rB", "rN", "rR", nil , nil , nil ,
-  pieces_in_hand_grouped_by_sides: [
-    [],
-    [],
-    [],
-    []
-  ]
-)
-
-starting_position.in_hand_pieces
-# => []
-
-starting_position.squares
-# => [nil , nil , nil , "yR", "yN", "yB", "yK", "yQ", "yB", "yN", "yR", nil , nil , nil ,
-#     nil , nil , nil , "yP", "yP", "yP", "yP", "yP", "yP", "yP", "yP", nil , nil , nil ,
-#     nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , nil ,
-#     "bR", "bP", nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , "gP", "gR",
-#     "bN", "bP", nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , "gP", "gN",
-#     "bB", "bP", nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , "gP", "gB",
-#     "bK", "bP", nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , "gP", "gQ",
-#     "bQ", "bP", nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , "gP", "gK",
-#     "bB", "bP", nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , "gP", "gB",
-#     "bN", "bP", nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , "gP", "gN",
-#     "bR", "bP", nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , "gP", "gR",
-#     nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , nil ,
-#     nil , nil , nil , "rP", "rP", "rP", "rP", "rP", "rP", "rP", "rP", nil , nil , nil ,
-#     nil , nil , nil , "rR", "rN", "rB", "rQ", "rK", "rB", "rN", "rR", nil , nil , nil]
-
-starting_position.pieces_in_hand_grouped_by_sides
-# => [[], [], [], []]
-
-starting_position.active_side_id
-# => 0
-
-starting_position.feen(14, 14)
-# => "3,yR,yN,yB,yK,yQ,yB,yN,yR,3/3,yP,yP,yP,yP,yP,yP,yP,yP,3/14/bR,bP,10,gP,gR/bN,bP,10,gP,gN/bB,bP,10,gP,gB/bK,bP,10,gP,gQ/bQ,bP,10,gP,gK/bB,bP,10,gP,gB/bN,bP,10,gP,gN/bR,bP,10,gP,gR/14/3,rP,rP,rP,rP,rP,rP,rP,rP,3/3,rR,rN,rB,rQ,rK,rB,rN,rR,3 0 ///"
-
-# List of moves (see https://github.com/sashite/pmn.rb)
-moves = [
-  [ 175, 147, "rP" ],
-  [ 85, 87, "bP" ],
-  [ 20, 48, "yP" ],
-  [ 110, 108, "gP" ],
-  [ 191, 162, "rN" ]
-]
-
-last_position = moves.reduce(starting_position) do |position, move|
-  position.call(move)
-end
-
-last_position.in_hand_pieces
-# => []
-
-last_position.squares
-# => [nil , nil , nil , "yR", "yN", "yB", "yK", "yQ", "yB", "yN", "yR", nil , nil , nil ,
-#     nil , nil , nil , "yP", "yP", "yP", nil , "yP", "yP", "yP", "yP", nil , nil , nil ,
-#     nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , nil ,
-#     "bR", "bP", nil , nil , nil , nil , "yP", nil , nil , nil , nil , nil , "gP", "gR",
-#     "bN", "bP", nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , "gP", "gN",
-#     "bB", "bP", nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , "gP", "gB",
-#     "bK", nil , nil , "bP", nil , nil , nil , nil , nil , nil , nil , nil , "gP", "gQ",
-#     "bQ", "bP", nil , nil , nil , nil , nil , nil , nil , nil , "gP", nil , nil , "gK",
-#     "bB", "bP", nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , "gP", "gB",
-#     "bN", "bP", nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , "gP", "gN",
-#     "bR", "bP", nil , nil , nil , nil , nil , "rP", nil , nil , nil , nil , "gP", "gR",
-#     nil , nil , nil , nil , nil , nil , nil , nil , "rN", nil , nil , nil , nil , nil ,
-#     nil , nil , nil , "rP", "rP", "rP", "rP", nil , "rP", "rP", "rP", nil , nil , nil ,
-#     nil , nil , nil , "rR", "rN", "rB", "rQ", "rK", "rB", nil , "rR", nil , nil , nil]
-
-last_position.pieces_in_hand_grouped_by_sides
-# => [[], [], [], []]
-
-last_position.active_side_id
-# => 1
-
-last_position.feen(14, 14)
-# => "3,yR,yN,yB,yK,yQ,yB,yN,yR,3/3,yP,yP,yP,1,yP,yP,yP,yP,3/14/bR,bP,4,yP,5,gP,gR/bN,bP,10,gP,gN/bB,bP,10,gP,gB/bK,2,bP,8,gP,gQ/bQ,bP,8,gP,2,gK/bB,bP,10,gP,gB/bN,bP,10,gP,gN/bR,bP,5,rP,4,gP,gR/8,rN,5/3,rP,rP,rP,rP,1,rP,rP,rP,3/3,rR,rN,rB,rQ,rK,rB,1,rR,3 1 ///"
+# => {: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,48 @@
 # frozen_string_literal: true
 
-# The Qi module.
+require_relative File.join("qi", "move")
+
+# The Qi abstraction.
+#
+# @example Apply a move to a classic Shogi problem
+#   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
+  # 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 Apply a move to a classic Shogi problem
+  #   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"}}
+  #
+  # @return [Hash] The piece set of the next position.
+  def self.call(move, in_hand:, square:)
+    Move.new(move).call(in_hand: in_hand, square: square)
+  end
 end
-
-require_relative "qi/position"

data/lib/qi/action.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+module Qi
+  # The Action abstraction.
+  class Action
+    # Initialize an action instance.
+    #
+    # @param src_square_id [Integer, nil] The source square ID.
+    # @param dst_square_id [Integer] The target square ID.
+    # @param moved_piece_name [String] The moved piece name.
+    # @param captured_piece_name [String, nil] The captured piece name.
+    #
+    # @example Initialize a promoted bishop action from 43 to 13
+    #   new(43, 13, "+B", nil)
+    #
+    # @see https://developer.sashite.com/specs/portable-action-notation
+    def initialize(src_square_id, dst_square_id, moved_piece_name, captured_piece_name = nil)
+      @src_square_id = src_square_id
+      @dst_square_id = dst_square_id
+      @moved_piece_name = moved_piece_name
+      @captured_piece_name = captured_piece_name
+    end
+
+    # Commit an action to the position.
+    #
+    # @param in_hand [Array] The list of pieces in hand.
+    # @param square [Hash] The index of each piece on the board.
+    #
+    # @example Commit a Shogi action to the piece set of a position
+    #   call(
+    #     43, 13, "+B", nil,
+    #     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"}}
+    #
+    # @return [Hash] The next piece set.
+    def call(in_hand:, square:)
+      in_hand = in_hand.dup
+      square = square.dup
+
+      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
+
+      square[@dst_square_id] = @moved_piece_name
+      in_hand.push(@captured_piece_name) unless @captured_piece_name.nil?
+
+      { in_hand: in_hand, square: square }
+    end
+  end
+end

data/lib/qi/move.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require_relative "action"
+
+module Qi
+  # The Move abstraction.
+  class Move
+    # Initialize a move instance.
+    #
+    # @param move [Array] The move to apply.
+    #
+    # @example Initialize a promoted bishop move from 43 to 13
+    #   new([43, 13, "+B"])
+    #
+    # @see https://developer.sashite.com/specs/portable-move-notation
+    def initialize(move)
+      @actions = move.each_slice(4)
+    end
+
+    # Apply a move to the piece set of a position.
+    #
+    # @param in_hand [Array] The list of pieces in hand.
+    # @param square [Hash] The index of each piece on the board.
+    #
+    # @example Apply a move to a classic Shogi problem
+    #   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"}}
+    #
+    # @return [Hash] The piece set of the next position.
+    def call(in_hand:, square:)
+      @actions.inject(in_hand: in_hand, square: square) do |piece_set, attrs|
+        Action.new(*attrs).call(**piece_set)
+      end
+    end
+  end
+end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: qi
 version: !ruby/object:Gem::Version
-  version: 6.2.0
+  version: 9.0.0.beta1
 platform: ruby
 authors:
 - Cyril Kato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-25 00:00:00.000000000 Z
+date: 2020-10-03 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: feen
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: brutal
   requirement: !ruby/object:Gem::Requirement
@@ -131,7 +117,8 @@ files:
 - LICENSE.md
 - README.md
 - lib/qi.rb
-- lib/qi/position.rb
+- lib/qi/action.rb
+- lib/qi/move.rb
 homepage: https://developer.sashite.com/specs/
 licenses:
 - MIT
@@ -147,15 +134,15 @@ 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:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 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,202 +0,0 @@
-# frozen_string_literal: true
-
-module Qi
-  # The position class.
-  #
-  # @see https://developer.sashite.com/specs/portable-chess-notation
-  class Position
-    # Players are identified by a number according to the order in which they
-    #   traditionally play from the starting position.
-    #
-    # @!attribute [r] active_side_id
-    #   @return [Integer] The identifier of the player who must play.
-    attr_reader :active_side_id
-
-    # The list of pieces in hand owned by players.
-    #
-    # @!attribute [r] pieces_in_hand_grouped_by_sides
-    #   @return [Array] The list of pieces in hand for each side.
-    attr_reader :pieces_in_hand_grouped_by_sides
-
-    # The list of squares of on the board.
-    #
-    # @!attribute [r] squares
-    #   @return [Array] The list of squares.
-    attr_reader :squares
-
-    # Initialize a position.
-    #
-    # @param squares [Array] The list of squares of on the board.
-    # @param active_side_id [Integer] The identifier of the player who must play.
-    # @param pieces_in_hand_grouped_by_sides [Array] The list of pieces in hand
-    #   grouped by players.
-    #
-    # @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 Four-player chess's starting position
-    #   Position.new(
-    #     nil , nil , nil , "yR", "yN", "yB", "yK", "yQ", "yB", "yN", "yR", nil , nil , nil ,
-    #     nil , nil , nil , "yP", "yP", "yP", "yP", "yP", "yP", "yP", "yP", nil , nil , nil ,
-    #     nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , nil ,
-    #     "bR", "bP", nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , "gP", "gR",
-    #     "bN", "bP", nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , "gP", "gN",
-    #     "bB", "bP", nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , "gP", "gB",
-    #     "bK", "bP", nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , "gP", "gQ",
-    #     "bQ", "bP", nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , "gP", "gK",
-    #     "bB", "bP", nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , "gP", "gB",
-    #     "bN", "bP", nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , "gP", "gN",
-    #     "bR", "bP", nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , "gP", "gR",
-    #     nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , nil , nil ,
-    #     nil , nil , nil , "rP", "rP", "rP", "rP", "rP", "rP", "rP", "rP", nil , nil , nil ,
-    #     nil , nil , nil , "rR", "rN", "rB", "rQ", "rK", "rB", "rN", "rR", nil , nil , nil ,
-    #     pieces_in_hand_grouped_by_sides: [
-    #       [],
-    #       [],
-    #       [],
-    #       []
-    #     ]
-    #   )
-    #
-    # @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 A classic Tsume Shogi problem
-    #   Position.new(
-    #     nil, nil, nil, "s", "k", "s", nil, nil, nil,
-    #     nil, nil, nil, nil, nil, nil, nil, nil, nil,
-    #     nil, nil, nil, nil, "+P", nil, nil, nil, nil,
-    #     nil, nil, nil, nil, nil, nil, nil, nil, nil,
-    #     nil, nil, nil, nil, nil, nil, nil, "+B", 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,
-    #     pieces_in_hand_grouped_by_sides: [
-    #       ["S"],
-    #       ["b", "g", "g", "g", "g", "n", "n", "n", "n", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "p", "r", "r", "s"]
-    #     ]
-    #   )
-    #
-    # @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, active_side_id: 0, pieces_in_hand_grouped_by_sides: [[], []])
-      @squares = squares
-      @active_side_id = active_side_id % pieces_in_hand_grouped_by_sides.length
-      @pieces_in_hand_grouped_by_sides = pieces_in_hand_grouped_by_sides
-
-      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_in_hand_pieces = 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?
-          piece_in_hand_id = updated_in_hand_pieces.index(moved_piece_name)
-          updated_in_hand_pieces.delete_at(piece_in_hand_id)
-        else
-          updated_squares[src_square_id] = nil
-        end
-
-        updated_squares[dst_square_id] = moved_piece_name
-
-        unless captured_piece_name.nil?
-          updated_in_hand_pieces.push(captured_piece_name)
-        end
-      end
-
-      updated_pieces_in_hand_grouped_by_sides = pieces_in_hand_grouped_by_sides.dup
-      updated_pieces_in_hand_grouped_by_sides[active_side_id] = updated_in_hand_pieces
-
-      self.class.new(*updated_squares,
-        active_side_id: active_side_id.next,
-        pieces_in_hand_grouped_by_sides: updated_pieces_in_hand_grouped_by_sides
-      )
-    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
-      pieces_in_hand_grouped_by_sides.fetch(active_side_id)
-    end
-
-    # Forsyth–Edwards Expanded Notation.
-    #
-    # @see https://developer.sashite.com/specs/forsyth-edwards-expanded-notation
-    #
-    # @param indexes [Array] The shape of the board.
-    #
-    # @example Generate the FEEN string of a Xiangqi position
-    #   feen(10, 9)
-    #
-    # @return [String] The FEEN representation of the position.
-    def feen(*indexes)
-      ::FEEN.dump(
-        active_side_id: active_side_id,
-        board: squares.each_with_index.inject({}) { |h, (v, i)| v.nil? ? h : h.merge(i.to_s.to_sym => v) },
-        indexes: indexes,
-        pieces_in_hand_grouped_by_sides: pieces_in_hand_grouped_by_sides
-      )
-    end
-  end
-end
-
-require "feen"