shogi-ruby 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e19666afd7c10c5196dd059f8fbd26b30051a95
-  data.tar.gz: a7c9cd4003dbf8831220a4b80a610af89487586b
+  metadata.gz: 469ae5eee31baa8c42df5bf289836bbc8656ef35
+  data.tar.gz: 987b2fd2abe8c56684eb1039bbdf5498a8909ffe
 SHA512:
-  metadata.gz: f51786284a2215ba437c801a2dcaae9a08b456d1d9227b1e0900b9325b74ed0bab0a6b080ae8789f6419585b015042f42f417dcf5df100048bacc96e97867cac
-  data.tar.gz: 2f751b50e67375844d25ce241d5e819859adb7caf228d51f4c64832fe7e7a16f9da262a3350f3bbbeda6290f1ae64289bb284272e203d273e21e5e820a122b34
+  metadata.gz: 3c4248c0be25827324230f8cde9d3f04a08c5e1d82344cb2ad6a4508eb9da1bae16222980129e9e86b22eed971c3face6e3de28a8613209f253fd0adce003fd3
+  data.tar.gz: 1ddb6295dabc9ad55c97d9471060e6674cffce6d6bd2503f8954d935a840dc5c870be07fd29776846a4ccdd7bb66aa5f397a09a9acdbb016dcdf6fe998a9e975

data/README.md

@@ -50,7 +50,6 @@ Ruby 2.0.0 or later. (and 1.9.3)
         P+
         P-
 
-    board.move_from_csa("+7776FU")
     board.move_from_csa("-3334FU")
     board.move_from_csa("+8822UM")
     board.to_csa

data/lib/shogi/board.rb

@@ -1,11 +1,21 @@
 module Shogi
   class Board
-    class Error < StandardError
-    end
-
-    def initialize
-      @position = default_position
-      @captured = []
+    class Error               < StandardError; end
+    class CodingError         < Error; end
+    class FormatError         < Error; end
+    class UndefinedPieceError < Error; end
+    class MoveError           < Error; end
+    class MovementError       < Error; end
+
+    attr_accessor :validate_movement
+    def initialize(csa=nil)
+      if csa
+        set_from_csa(csa)
+      else
+        @position = default_position
+        @captured = []
+      end
+      @validate_movement = true
     end
 
     def to_csa
@@ -38,6 +48,37 @@ module Shogi
       csa_rows
     end
 
+    def set_from_csa(csa)
+      position = []
+      cell_pattern = '[+-][A-Z]{2}| \* '
+      csa_lines = csa.each_line.to_a
+      csa_lines.slice(0, 9).to_enum.with_index do |row, i|
+        position_row = []
+        row.chomp!
+        unless /\AP#{i + 1}(#{cell_pattern}){9}\z/ =~ row
+          raise FormatError, "Format Error: line #{i + 1}"
+        end
+        row[2..28].scan(/#{cell_pattern}/) do |cell|
+          position_row << cell
+        end
+        position << position_row
+      end
+      @position = position
+
+      captured = []
+      csa_lines.slice(9, 2).each do |captured_line|
+        captured_line.chomp!
+        unless /\AP[+-](00[A-Z]{2})*\z/ =~ captured_line
+          raise FormatError, "Format Error: captured line"
+        end
+        turn = captured_line[1]
+        captured_line[2..-1].scan(/00([A-Z]{2})/) do |cell|
+          captured << turn + cell[0]
+        end
+      end
+      @captured = captured
+    end
+
     def to_usi
       @position.map {|row|
         usi_row = ""
@@ -68,17 +109,17 @@ module Shogi
 
     def move_from_csa(csa)
       unless /\A[+-](00|[1-9]{2})[1-9]{2}[A-Z]{2}\z/ =~ csa
-        raise Error, "Format Error"
+        raise FormatError, "Wrong CSA format: #{csa}"
       end
 
       unless Piece.const_defined?(csa[5..6])
-        raise Error, "No Defined Piece Error"
+        raise UndefinedPieceError, "Undefined piece: #{csa[5..6]}"
       end
 
       if csa[1..2] == "00"
         before_piece = csa[0] + csa[5..6]
         unless @captured.include?(before_piece)
-          return false
+          raise MoveError, "Not captured piece: #{csa}"
         end
         before_cell = before_piece
         before_piece = eval("Piece::#{before_cell[1..2]}").new
@@ -86,16 +127,29 @@ module Shogi
         before_x = 9 - csa[1].to_i
         before_y = csa[2].to_i - 1
         before_cell = @position[before_y][before_x]
-        return false if before_cell == ""
+        if before_cell == ""
+          raise MoveError, "Before cell is blank"
+        end
         before_piece = eval("Piece::#{before_cell[1..2]}").new
 
         unless csa[0] == before_cell[0]
-          return false
+          raise MoveError, "Don't your piece: #{before_cell}"
         end
         unless csa[5..6] == before_cell[1..2]
           after_piece = eval("Piece::#{csa[5..6]}").new
           unless before_piece.promoter == after_piece.class
-            return false
+          raise MoveError, "Don't promote: #{before_cell[1..2]} -> #{csa[5..6]}"
+          end
+
+          after_y = csa[4].to_i - 1
+          if csa[0] == "+"
+            unless after_y < 3 || before_y < 3
+              raise_movement_error("Don't promote line: #{csa}")
+            end
+          else
+            unless after_y > 6 || before_y > 6
+              raise_movement_error("Don't promote line: #{csa}")
+            end
           end
         end
       end
@@ -104,11 +158,13 @@ module Shogi
       after_y = csa[4].to_i - 1
       after_cell = @position[after_y][after_x]
       if csa[0] == after_cell[0]
-        return false
+        raise MoveError, "Your piece on after cell: #{csa}"
       end
 
       if csa[1..2] == "00"
-        return false unless after_cell == ""
+        unless after_cell == ""
+          raise MoveError, "Exist piece on after cell"
+        end
       else
         if csa[0] == "+"
           movement_x = after_x - before_x
@@ -119,7 +175,7 @@ module Shogi
         end
 
         unless before_piece.move?(movement_x, movement_y)
-          return false
+          raise_movement_error("Invalid movement")
         end
       end
 
@@ -144,7 +200,7 @@ module Shogi
         end
 
         unless used == before_cell
-          raise Error, "[Bug] missing piece in captured"
+          raise CodingError, "[Bug] missing piece in captured"
         end
       else
         @position[before_y][before_x] = ""
@@ -153,6 +209,13 @@ module Shogi
       true
     end
 
+    def move_from_csa_lines(csa_lines)
+      csa_lines.each_line do |csa|
+        csa.chomp!
+        move_from_csa(csa)
+      end
+    end
+
     private
     def default_position
       [["-KY", "-KE", "-GI", "-KI", "-OU", "-KI", "-GI", "-KE", "-KY"],
@@ -165,5 +228,11 @@ module Shogi
        [   "", "+KA",    "",    "",    "",    "",    "", "+HI",    ""],
        ["+KY", "+KE", "+GI", "+KI", "+OU", "+KI", "+GI", "+KE", "+KY"]]
     end
+
+    def raise_movement_error(message)
+      if @validate_movement
+        raise MovementError, message
+      end
+    end
   end
 end

data/lib/shogi/version.rb

@@ -1,3 +1,3 @@
 module Shogi
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/test/test-board.rb

@@ -11,6 +11,24 @@ class BoardTest < Test::Unit::TestCase
     assert_true(rows.all? {|row| row.size == 9 })
   end
 
+  def test_initialize_csa
+    csa = <<-EOT
+P1 *  *  *  * +HI *  * -KE * 
+P2 *  *  *  *  * +KA-OU * -KY
+P3 *  *  *  *  *  * -FU-FU-FU
+P4 *  *  *  * +KY *  * -GI * 
+P5 *  *  *  *  *  *  *  *  * 
+P6 *  *  *  *  *  *  *  *  * 
+P7 *  *  *  *  *  *  *  *  * 
+P8 *  *  *  *  *  *  *  *  * 
+P9 *  *  *  *  *  *  *  *  * 
+P+00HI00GI00KE
+P-
+    EOT
+    @board = Shogi::Board.new(csa)
+    assert_equal(csa, @board.to_csa)
+  end
+
   def test_to_csa
     before_state = @board.instance_variable_get(:@position).dup
     assert_equal(<<-EOT, @board.to_csa)
@@ -29,6 +47,24 @@ P-
     assert_equal(before_state, @board.instance_variable_get(:@position))
   end
 
+  def test_set_from_csa
+    csa = <<-EOT
+P1 *  *  *  * +HI *  * -KE * 
+P2 *  *  *  *  * +KA-OU * -KY
+P3 *  *  *  *  *  * -FU-FU-FU
+P4 *  *  *  * +KY *  * -GI * 
+P5 *  *  *  *  *  *  *  *  * 
+P6 *  *  *  *  *  *  *  *  * 
+P7 *  *  *  *  *  *  *  *  * 
+P8 *  *  *  *  *  *  *  *  * 
+P9 *  *  *  *  *  *  *  *  * 
+P+00HI00GI00KE
+P-
+    EOT
+    @board.set_from_csa(csa)
+    assert_equal(csa, @board.to_csa)
+  end
+
   def test_to_usi
     before_state = @board.instance_variable_get(:@position).dup
     assert_equal(<<-EOT, @board.to_usi)
@@ -38,17 +74,27 @@ lnsgkgsnl/1r5b1/ppppppppp/9/9/9/PPPPPPPPP/1B5R1/LNSGKGSNL
   end
 
   def test_move_from_csa
-    assert_raise Shogi::Board::Error do
+    assert_raise Shogi::Board::FormatError do
       @board.move_from_csa("+27FU")
     end
-    assert_raise Shogi::Board::Error do
+    assert_raise Shogi::Board::UndefinedPieceError do
       @board.move_from_csa("+2726AA")
     end
-    assert_false(@board.move_from_csa("+2726HI"))
-    assert_false(@board.move_from_csa("+2827HI"))
-    assert_false(@board.move_from_csa("+2625FU"))
-    assert_false(@board.move_from_csa("+2725FU"))
-    assert_false(@board.move_from_csa("-4131KI"))
+    assert_raise Shogi::Board::MoveError do
+      assert_false(@board.move_from_csa("+2726HI"))
+    end
+    assert_raise Shogi::Board::MoveError do
+      assert_false(@board.move_from_csa("+2827HI"))
+    end
+    assert_raise Shogi::Board::MoveError do
+      assert_false(@board.move_from_csa("+2625FU"))
+    end
+    assert_raise Shogi::Board::MovementError do
+      assert_false(@board.move_from_csa("+2725FU"))
+    end
+    assert_raise Shogi::Board::MoveError do
+      assert_false(@board.move_from_csa("-4131KI"))
+    end
     assert_true(@board.move_from_csa("+7776FU"))
     assert_true(@board.move_from_csa("-4132KI"))
     assert_true(@board.move_from_csa("+2868HI"))
@@ -104,6 +150,9 @@ P-00KA
   def test_move_from_csa_promote
     @board.move_from_csa("+7776FU")
     @board.move_from_csa("-3334FU")
+    assert_raise Shogi::Board::MovementError do
+      assert_false(@board.move_from_csa("+2726TO"))
+    end
     assert_true(@board.move_from_csa("+8822UM"))
     assert_equal(<<-EOT, @board.to_csa)
 P1-KY-KE-GI-KI-OU-KI-GI-KE-KY
@@ -132,5 +181,55 @@ P9+KY+KE+GI+KI+OU+KI+GI+KE+KY
 P+00KA
 P-00KA
     EOT
+    assert_true(@board.move_from_csa("+0033KA"))
+    assert_true(@board.move_from_csa("-0078KA"))
+    assert_true(@board.move_from_csa("+3366UM"))
+    assert_true(@board.move_from_csa("-7867UM"))
+    assert_equal(<<-EOT, @board.to_csa)
+P1-KY-KE-GI-KI-OU-KI * -KE-KY
+P2 * -HI *  *  *  *  * -GI * 
+P3-FU-FU-FU-FU-FU-FU * -FU-FU
+P4 *  *  *  *  *  * -FU *  * 
+P5 *  *  *  *  *  *  *  *  * 
+P6 *  * +FU+UM *  *  *  *  * 
+P7+FU+FU * -UM+FU+FU+FU+FU+FU
+P8 *  *  *  *  *  *  * +HI * 
+P9+KY+KE+GI+KI+OU+KI+GI+KE+KY
+P+
+P-00FU
+    EOT
+  end
+
+  def test_move_from_csa_lines
+    csa_lines = <<-EOT
++7776FU
+-3334FU
++8822KA
+-3122GI
++0055KA
+    EOT
+
+    @board.move_from_csa_lines(csa_lines)
+
+    assert_equal(<<-EOT, @board.to_csa)
+P1-KY-KE-GI-KI-OU-KI * -KE-KY
+P2 * -HI *  *  *  *  * -GI * 
+P3-FU-FU-FU-FU-FU-FU * -FU-FU
+P4 *  *  *  *  *  * -FU *  * 
+P5 *  *  *  * +KA *  *  *  * 
+P6 *  * +FU *  *  *  *  *  * 
+P7+FU+FU * +FU+FU+FU+FU+FU+FU
+P8 *  *  *  *  *  *  * +HI * 
+P9+KY+KE+GI+KI+OU+KI+GI+KE+KY
+P+
+P-00KA
+    EOT
+  end
+
+  def test_validate_movement_false
+    assert_true(@board.validate_movement)
+    @board.validate_movement = false
+    assert_false(@board.validate_movement)
+    assert_true(@board.move_from_csa("+2755FU"))
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shogi-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Masafumi Yokoyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-13 00:00:00.000000000 Z
+date: 2013-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit