RubyShogi 0.2 → 0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 436d061edb50eee96d957a656caab3673b93183494b33d67324d68a4c006dd4e
-  data.tar.gz: 18a2ad1204d24f8f17cd099ae48f08530ebabdc18fca03c984cd754e462d3c92
+  metadata.gz: 6701c33167fe944ca928ebd9bcf6ffccda09f294a416f6dafc8730b9f668a879
+  data.tar.gz: b8ea182ba133ac2e99f0da4d0434c7227a6f13abd2331178f179350c6c21e639
 SHA512:
-  metadata.gz: b5319bc2ea8d8368b22f94afd7869b25462c139d04ba34e8bc576fe562a258465a00512e3b117d913f3b6d9a9f794c4ac94b97e65cd89cf3625dc83e4e925e86
-  data.tar.gz: ef8812338d72cce94172439336f356b78fab48a21133aa2a1f819142c87331af40b36c17011575c5073284e6e147203bdc701d32992339c3268c59178b1c6165
+  metadata.gz: f24bf303d7e6fd9f2dd76559673bbf2eed9dff4dfe6e0a14eb6fd1e4311ea9a929522baf23b538752928047d86f641f4384f5834d14a7949f1f7641dd14169a5
+  data.tar.gz: 4f249d08e78e8adc31476e12bdeafd49a5269739cfea6e9ff785a6ecf46cac9362986bfde156be498478af9b05bb060c88d955e04316baccdbf5be09ec7eb6ad

data/lib/ruby_shogi/board.rb

@@ -43,9 +43,8 @@ class Board
 	
 	attr_accessor :brd, :wking, :bking, :white_pocket, :black_pocket, :variant, :nodetype, :r50, :drop, :hash, :fullmoves, :wtm, :eat, :from, :to, :score, :promo, :index
 	
-	def initialize(pos = nil)
+	def initialize
 		initme
-		fen(pos)
 	end
 
 	def initme
@@ -88,6 +87,11 @@ class Board
 		s
 	end
 	
+	def mustbeok
+		fail if find_white_king != @wking
+		fail if find_black_king != @bking
+	end
+	
 	def wtm2str
 		@wtm ? "w" : "b"
 	end
@@ -114,7 +118,6 @@ class Board
 	end
 		
 	def make_move(me, from, to)
-		#fail unless (good_coord?(from) && good_coord?(to))
 		@eat = @brd[to]
 		@brd[to] = me
 		@brd[from] = 0
@@ -184,15 +187,15 @@ class Board
 	end
 	
 	def empty?(i)
-		@brd[i] == 0
+		@brd[i].zero?
 	end
 	
 	def walkable_w?(square)
-		@brd[square] < 1
+		@brd[square] <= 0
 	end
 	
 	def walkable_b?(square)
-		@brd[square] > -1
+		@brd[square] >= 0
 	end
 	
 	def is_on_board?(x, y)	
@@ -358,8 +361,15 @@ class Board
 		@wtm = s == "w" ? true : false
 	end
 	
+	def fen2(s = nil)
+		if s.nil?
+			fen(START_POS)
+		else
+			fen(s)
+		end
+	end
+	
 	def fen(str)
-		return if str.nil?
 		initme
 		s = str.strip.split(" ")
 		fail if s.length < 3
@@ -389,6 +399,10 @@ class Board
 		s.strip.length == 0 ? "-" : s
 	end
 	
+	def move2str
+		move_str
+	end
+	
 	def move_str
 		if @drop != 0
 			s = "#{number2piece(@drop).upcase}@"
@@ -411,16 +425,32 @@ class Board
 		s
 	end
 		
-	def randpos
+	def randpos2
 		copy = RubyShogi::Board.new
-		copy.brd[rand(0..	32)] = 14
-		copy.brd[rand((81-32)..80)] = -14
-		32.times { |i| copy.brd[32 + i] = rand(-14..14) if rand < 0.3 }
-		3.times { |i| copy.white_pocket.push([1, 3, 5, 7, 9].sample) }
-		3.times { |i| copy.black_pocket.push([-1, -3, -5, -7, -9].sample) }
+		copy.brd[rand(0..9)] = 14
+		copy.brd[rand(71..80)] = -14
+		8.times { |i| copy.brd[32 + i] = rand(-13..13) if rand < 0.3 }
+		3.times { |i| copy.white_pocket.push([1, 3, 5, 7, 9].sample) if rand < 0.3  }
+		3.times { |i| copy.black_pocket.push([-1, -3, -5, -7, -9].sample) if rand < 0.3 }
+		copy.wking = copy.find_white_king
+		copy.bking = copy.find_black_king
 		copy
 	end
 	
+		
+	def randpos
+		brd = nil
+		loop do
+			brd = randpos2
+			brd2 = brd
+			mgen = brd.mgen_generator
+			next if mgen.checks_b? || mgen.checks_w?
+			break
+		end
+		brd.mustbeok
+		brd
+	end
+	
 	def print_board
 		s =""
 		81.times do | i |

data/lib/ruby_shogi/cmd.rb

@@ -8,7 +8,7 @@ module RubyShogi
 
 class Cmd
 	attr_accessor :engine, :random_mode
-
+	
 	def initialize
 		@random_mode = false
 		@tokens = RubyShogi::Tokens.new(ARGV)
@@ -33,26 +33,29 @@ class Cmd
 	end
 		
 	def mbench
-		suite(peek_argint(4))
+		p = RubyShogi::Perft.new
+		p.suite(peek_argint(4))
 	end
 	
 	def perft
+		n = peek_argint(5)
+		puts "~~~ perft( #{n} ) ~~~"
 		p = RubyShogi::Perft.new(@fen)
-		p.perft(peek_argint(5))
+		p.perft(n)
 	end
 	
 	def randperft
-		n = peek_argint(3)
+		n = peek_argint(10)
+		puts "~~~ randperft( #{n} ) ~~~"
 		n.times do |i|
 			p = RubyShogi::Perft.new
-			puts "#{i} / ..."
-			p.randperft(2)
+			p.randperft(2, i, n)
 		end
 	end
 	
 	def suite
 		p = RubyShogi::Perft.new
-		p.suite(peek_argint(5))
+		p.suite(peek_argint(4))
 	end
 	
 	def bench
@@ -61,14 +64,9 @@ class Cmd
 	end
 	
 	def stats
-		n, val = 100, @tokens.peek(1)
-		if val != nil && val.match(/\d+/)
-			@tokens.forward
-			n = val.to_i
-		end
-		e = RubyShogi::Engine.new("falcon", random_mode: @random_mode)
-		e.board.use_fen(@fen) if @fen != nil
-		e.stats(n)
+		e = RubyShogi::Engine.new(random_mode: @random_mode)
+		e.board.fen(@fen) if @fen != nil
+		e.stats(peek_argint(100))
 	end
 	
 	def tactics
@@ -82,25 +80,62 @@ class Cmd
 	
 	def list
 		board = RubyShogi::Board.new
-		board.fen(@fen)
+		board.fen2(@fen)
 		mgen = board.mgen_generator
 		moves = mgen.generate_moves
-		moves.each_with_index { |b, i| puts "> #{i}: #{b.move_str}" }
+		mgen.print_move_list
+		puts "= #{moves.length} moves"
 	end
+	
+	#def list
+	#	board = RubyShogi::Board.new
+	#	board.fen(@fen)
+	#	mgen = board.mgen_generator
+	#	moves = mgen.generate_moves
+	#	moves.each_with_index { |b, i| puts "> #{i}: #{b.move_str}" }
+	#end
 
+	def perft_by_moves
+		#b = RubyShogi::Board.new
+		#b.startpos
+		#b.fen("lnsgkgsnl/2r4b1/ppppp+Pp1p/7p1/9/9/PPPPP1PPP/1B5R1/LNSGKGSNL[P] w 1 5")
+		#b.fen("9/3k5/7+P1/8P/9/9/6P2/R3K4/1NSG1GSNL[PPPPPPPPPNNBRLLSSGGppppppbl] w 19 100")
+		#      +P8/9/8L/L3k3R/1KP6/9/3s5/2S6/1+n1g4+B[PPPPPPPPPNBRLLSGpppppppnnsgg] b
+		#		b.fen("5K3/2+P6/6+P2/9/4k4/9/9/9/9[PPPPPPPPPNNBRLLSSGGpppppppnnbrllssgg] w 67 185")
+		#b.fen("8+r/5K3/9/9/9/9/k8/9/9[-] w 24 1")
+		#b.fen("9/+l4k3/+P1+r2L1+l1/+l3+B2S1/1n5rR/5+l+l2/9/9/1K7[LGNpgl] w 0 1")
+		#b.print_board
+		#mgen = b.mgen_generator
+		#mgen.generate_moves
+		
+		# 5k3/+n8/1G5R1/2+s+P3b1/n+s2l+B+N2/5s+prp/9/7K1/9 w
+		#p = RubyShogi::Perft.new("5k3/+n8/1G5R1/2+s+P3b1/n+s2l+B+N2/5s+prp/9/7K1/9[SPGnpn] w 0 1")
+		p = RubyShogi::Perft.new("5k3/+n8/1G5R1/2+s+P3b1/n+s2l+B+N2/5s+prp/9/8K/9[PSGpnn] b 0 1")
+		
+		p.perft_by_moves(peek_argint(1))
+	end
+	
 	def test
-		b = RubyShogi::Board.new
+		#b = RubyShogi::Board.new
 		#b.startpos
 		#b.fen("lnsgkgsnl/2r4b1/ppppp+Pp1p/7p1/9/9/PPPPP1PPP/1B5R1/LNSGKGSNL[P] w 1 5")
 		#b.fen("9/3k5/7+P1/8P/9/9/6P2/R3K4/1NSG1GSNL[PPPPPPPPPNNBRLLSSGGppppppbl] w 19 100")
 		#      +P8/9/8L/L3k3R/1KP6/9/3s5/2S6/1+n1g4+B[PPPPPPPPPNBRLLSGpppppppnnsgg] b
 		#		b.fen("5K3/2+P6/6+P2/9/4k4/9/9/9/9[PPPPPPPPPNNBRLLSSGGpppppppnnbrllssgg] w 67 185")
 		#b.fen("8+r/5K3/9/9/9/9/k8/9/9[-] w 24 1")
-		b.fen("2+P+P+P4/8P/3k3+P1/1+b2P1p2/3p2Pp1/2p5l/+p3+p3p/1p+l+p5/+p4K2+p[NNRSSGGnnbrllssgg] b 1 ")
-		b.print_board
-		mgen = b.mgen_generator
-		mgen.generate_moves
-		mgen.print_move_list
+		#b.fen("9/+l4k3/+P1+r2L1+l1/+l3+B2S1/1n5rR/5+l+l2/9/9/1K7[LGNpgl] w 0 1")
+		#b.print_board
+		#mgen = b.mgen_generator
+		#mgen.generate_moves
+		# 5k3/+n8/1G5R1/2+s+P3b1/n+s2l+B+N2/5s+prp/9/7K1/9 w
+		p = RubyShogi::Perft.new("5k3/+n8/1G5R1/2+s+P3b1/n+s2l+B+N2/5s+prp/9/7K1/9[SPGnpn] w 0 1")
+		
+		p = RubyShogi::Perft.new("7lk/9/8S/9/9/9/9/7L1/8K[P] w 0 1")
+		
+		
+		p.board.print_board
+		p.perft_by_moves(peek_argint(1))
+		#p.perft(peek_argint(5))
 	end
 	
 	def print_numbers
@@ -147,6 +182,7 @@ class Cmd
 		puts "-bench: Benchmark ShurikenShogi Engine"
 		puts "-mbench: Benchmark ShurikenShogi Movegen"
 		puts "-perft [NUM]: Run Perft"
+		puts "-perft_by_moves [NUM]: Run Perft By Moves"
 		puts "-profile: Profile ShurikenShogi"
 		puts "-randommode: Activate Random Mode"
 		puts "-fen [FEN]: Set Fen"
@@ -170,10 +206,12 @@ class Cmd
 			when "-test" then test
 			when "-name" then name
 			when "-fen" then fen
+			when "-list" then list
 			when "-profile" then profile
 			when "-perft" then perft
 			when "-randperft" then randperft
 			when "-suite" then suite
+			when "-perft_by_moves" then perft_by_moves
 			when "-numbers" then print_numbers
 			when "-help" then help
 			else

data/lib/ruby_shogi/engine.rb

@@ -228,7 +228,6 @@ class Engine
 		else
 			search(moves)
 			moves = func.call
-			#print_move_list(moves)
 			@board = moves[0]
 		end
 		print_move_list(moves) if @debug

data/lib/ruby_shogi/eval.rb

@@ -84,6 +84,28 @@ module Eval
 	end
 	
 	def Eval.material(board)
+		board.print_board
+		puts Eval.material2(board)
+		puts Eval.material3(board)
+		fail if Eval.material2(board) != Eval.material3(board)
+		0
+	end
+	
+	def Eval.material3(board)
+		score = board.brd.inject do |sum, p|
+			sum += case p
+				when 1..14 then MATERIAL_SCORE[p]
+				when -14..-1 then -MATERIAL_SCORE[-p]
+				else 
+					0
+				end
+		end
+		board.white_pocket.each { |p| score += MATERIAL_HAND_SCORE[p] }
+		board.black_pocket.each { |p| score -= MATERIAL_HAND_SCORE[-p] }
+		score
+	end
+	
+	def Eval.material2(board)
 		score = 0
 		board.brd.each do |p|
 			score += case p

data/lib/ruby_shogi/mgen.rb

@@ -54,17 +54,8 @@ class Mgen
 	end
 	
 	def remove_from_array(array, x)
-		found, a = false, []
-		array.each do |q|
-			if q == x
-				a.push(q) if found
-				found = true 
-			else
-				a.push(q)
-			end
-		end
-		fail if !found
-		a
+		array.delete_at(array.index(x) || array.length)
+		array
 	end
 	
 	def good_coord?(i)
@@ -112,15 +103,16 @@ class Mgen
 	def jump_checks_to?(jumps, here)
 		jumps.each do |jmp|
 			px, py = @x_checks + jmp[0], @y_checks + jmp[1]
-			return true if px + py * 9 == here
+			return true if is_on_board?(px, py) && px + py * 9 == here
 		end
 		false
 	end
 	
-	def checks_w?#(here)
-		here = @board.bking
+	def checks_w?(here = nil, useking = true)
+		here = here == nil ? @board.bking : here
+		#fail if @board.find_black_king !=  here
 		81.times do |i|
-			@x_checks, @y_checks = i % 9, i / 9 
+			@x_checks, @y_checks = i % 9, (i / 9).to_i
 			case @board.brd[i]
 			when 1 then return true if pawn_checks_w?(here)
 			when 2 then return true if jump_checks_to?(WHITE_GOLD_GENERAL_MOVES, here)
@@ -135,16 +127,17 @@ class Mgen
 			when 11 then return true if slider_checks_to?(BISHOP_MOVES, here) || jump_checks_to?(PROMOTED_BISHOP_MOVES, here)
 			when 12 then return true if slider_checks_to?(ROOK_MOVES, here)
 			when 13 then return true if slider_checks_to?(ROOK_MOVES, here) || jump_checks_to?(PROMOTED_ROOK_MOVES, here)
-			when 14 then return true if jump_checks_to?(KING_MOVES, here)
+			when 14 then return true if useking && jump_checks_to?(KING_MOVES, here)
 			end
 		end
 		false
 	end
-	
-	def checks_b?#(here)
-		here = @board.wking
+	 
+	def checks_b?(here = nil, useking = true)
+		here = here == nil ? @board.wking : here
+		#fail if @board.find_white_king != here
 		81.times do |i|
-			@x_checks, @y_checks = i % 9, i / 9 
+			@x_checks, @y_checks = i % 9, (i / 9).to_i
 			case @board.brd[i]
 			when -1 then return true if pawn_checks_b?(here)
 			when -2 then return true if jump_checks_to?(BLACK_GOLD_GENERAL_MOVES, here)
@@ -159,7 +152,7 @@ class Mgen
 			when -11 then return true if slider_checks_to?(BISHOP_MOVES, here) || jump_checks_to?(PROMOTED_BISHOP_MOVES, here)
 			when -12 then return true if slider_checks_to?(ROOK_MOVES, here)
 			when -13 then return true if slider_checks_to?(ROOK_MOVES, here) || jump_checks_to?(PROMOTED_ROOK_MOVES, here)
-			when -14 then return true if jump_checks_to?(KING_MOVES, here)
+			when -14 then return true if useking && jump_checks_to?(KING_MOVES, here)
 			end
 		end
 		false

data/lib/ruby_shogi/mgen_black.rb

@@ -44,14 +44,24 @@ class MgenBlack < RubyShogi::Mgen
 		copy.brd[@from_gen] = 0
 		copy.brd[to] = me
 		copy.bking = to if me == -14
-		#fail if copy.find_black_king != copy.bking
+		copy.mustbeok
 		@board = copy
 		@moves.push << copy if !checks_w?
 		@board = board2
 	end
 	
+	def can_white_king_run?(to2) 
+		x, y = to2 % 9, to2 / 9
+		KING_MOVES.each do |jmp|
+			px, py = x + jmp[0], y + jmp[1]
+			to = px + 9 * py
+			return true if is_on_board?(px, py) && @board.walkable_w?(to) && !checks_b?(to, false)
+		end
+		false
+	end
+	
 	def pawn_drop_checkmate?(to) 
-		@board.brd[to - 9] == 14 && !checks_w?(to - 9) ? true : false
+		@board.brd[to - 9] == 14 && (!checks_w?(to, false) && !can_white_king_run?(to - 9)) ? true : false
 	end
 	
 	def add_new_drop_move(me, to) 
@@ -59,19 +69,18 @@ class MgenBlack < RubyShogi::Mgen
 		return if me == -5 && to / 9 <= 1
 		board2 = @board
 		copy = @board.copy_me
-		copy.from = @from_gen
+		copy.from = -1
 		copy.to = to
 		copy.drop = me
 		copy.r50 += 1
 		copy.fullmoves += 1
 		copy.eat = 0
-		copy.wtm = ! copy.wtm
-		copy.brd[@from_gen] = 0
+		copy.wtm = !copy.wtm
 		copy.brd[to] = me
 		copy.black_pocket = remove_from_array(copy.black_pocket, me)
-		#fail if copy.find_black_king != copy.bking
+		copy.mustbeok
 		@board = copy
-		if !checks_w? && !(me == 1 && pawn_drop_checkmate?(to))
+		if !checks_w? && !(me == -1 && pawn_drop_checkmate?(to))
 			@moves.push << copy
 		end
 		@board = board2
@@ -79,7 +88,7 @@ class MgenBlack < RubyShogi::Mgen
 	
 	def handle_promotion?(me, to)
 		return true if must_promote?(me, to)
-		return false if to / 9 > 2 && @from_gen / 9 > 2
+		return false if to / 9 >= 3 && @from_gen / 9 >= 3
 		case me
 		when -1 
 			push_move(-1, to, PROMO_STAY)
@@ -163,34 +172,31 @@ class MgenBlack < RubyShogi::Mgen
 	end
 	
 	def pawn_on_column?(c)
-		ret = false
 		9.times do |i|
-			to = -9 * i + 8 * 9 + c
-			if to != @from_gen && @board.brd[to] == -1
-				ret = true
-				break
-			end
+			to = 9 * i + c
+			return true if to != @from_gen && @board.brd[to] == -1
 		end
-		ret
+		false
 	end
 	
 	def put_pawn_drops
 		(9*8).times do |i2|
 			i = i2 + 9
 			@x_gen, @y_gen, @from_gen = i % 9, i / 9, i
-			add_new_drop_move(-1, i) if !pawn_on_column?(i % 9 ) && @board.brd[i] == 0
+			add_new_drop_move(-1, i) if (!pawn_on_column?(i % 9 ) && @board.brd[i].zero?)
 		end
 	end
 	
 	def put_drops(piece)
 		81.times do |i|
 			@x_gen, @y_gen, @from_gen = i % 9, i / 9, i
-			add_new_drop_move(piece, i) if @board.brd[i] == 0
+			add_new_drop_move(piece, i) if @board.brd[i].zero?
 		end
 	end
 	
 	def generate_drops
-		@board.black_pocket.each do |piece|
+		nodub = @board.black_pocket.dup.uniq
+		nodub.each do |piece|
 			case piece
 			when -1 then put_pawn_drops
 			when -3 then put_drops(-3)
@@ -209,7 +215,6 @@ class MgenBlack < RubyShogi::Mgen
 		@moves = []
 		81.times do |i|
 			@x_gen, @y_gen, @from_gen = i % 9, i / 9, i
-			#puts @board.brd[i]
 			case @board.brd[i]
 			when -1 then generate_pawn_moves
 			when -2 then generate_jump_moves(BLACK_GOLD_GENERAL_MOVES, -2)

data/lib/ruby_shogi/mgen_white.rb

@@ -26,34 +26,43 @@ class MgenWhite < RubyShogi::Mgen
 		copy.brd[@from_gen] = 0
 		copy.brd[to] = me
 		copy.wking = to if me == 14
-		#fail if copy.find_white_king != copy.wking
+		copy.mustbeok
 		@board = copy
 		@moves.push << copy if !checks_b?
 		@board = board2
 	end
 	
+	def can_black_king_run?(to2) 
+		x, y = to2 % 9, to2 / 9
+		KING_MOVES.each do |jmp|
+			px, py = x + jmp[0], y + jmp[1]
+			return true if is_on_board?(px, py) && @board.walkable_b?(px + 9 * py) && !checks_w?(px + 9 * py, false)
+		end
+		false
+	end
+	
 	def pawn_drop_checkmate?(to) 
-		@board.brd[to + 9] == -14 && !checks_b?(to + 9) ? true : false
+		@board.brd[to + 9] == -14 && (!checks_b?(to, false) && !can_black_king_run?(to + 9)) ? true : false
 	end
 	
 	def add_new_drop_move(me, to)
 		return if me == 3 && to / 9 == 8
 		return if me == 5 && to / 9 >= 7
+		fail if !@board.brd[to].zero?
 		board2 = @board
 		copy = @board.copy_me
-		copy.from = @from_gen
+		copy.from = -1
 		copy.to = to
 		copy.drop = me
 		copy.eat = 0
 		copy.r50 += 1
 		copy.fullmoves += 1
-		copy.wtm = ! copy.wtm
-		copy.brd[@from_gen] = 0
+		copy.wtm = !copy.wtm
 		copy.brd[to] = me
 		copy.white_pocket = remove_from_array(copy.white_pocket, me)
-		#fail if copy.find_white_king != copy.wking
+		copy.mustbeok	
 		@board = copy
-		if !checks_b? && !(me == -1 && pawn_drop_checkmate?(to))
+		if !checks_b? && !(me == 1 && pawn_drop_checkmate?(to))
 			@moves.push << copy
 		end
 		@board = board2
@@ -164,33 +173,30 @@ class MgenWhite < RubyShogi::Mgen
 	end
 	
 	def pawn_on_column?(c)
-		ret = false
 		9.times do |i|
 			to = 9 * i + c
-			if to != @from_gen && @board.brd[to] == 1
-				ret = true
-				break
-			end
+			return true if to != @from_gen && @board.brd[to] == 1
 		end
-		ret
+		false
 	end
 	
 	def put_pawn_drops
 		(9*8).times do |i| 
 			@x_gen, @y_gen, @from_gen = i % 9, i / 9, i
-			add_new_drop_move(1, i) if !pawn_on_column?(i % 9 ) && @board.brd[i] == 0
+			add_new_drop_move(1, i) if !pawn_on_column?(i % 9 ) && @board.brd[i].zero?
 		end
 	end
 	
 	def put_drops(piece)
 		81.times do |i| 
 			@x_gen, @y_gen, @from_gen = i % 9, i / 9, i
-			add_new_drop_move(piece, i) if @board.brd[i] == 0
+			add_new_drop_move(piece, i) if @board.brd[i].zero?
 		end
 	end
 	
 	def generate_drops
-		@board.white_pocket.each do |piece|
+		nodub = @board.white_pocket.dup.uniq
+		nodub.each do |piece|
 			case piece
 			when 1 then put_pawn_drops
 			when 3 then put_drops(3)
@@ -200,6 +206,8 @@ class MgenWhite < RubyShogi::Mgen
 			when 10 then put_drops(10)
 			when 11 then put_drops(11)
 			when 12 then put_drops(12)
+			else
+				fail
 			end
 		end
 		@moves

data/lib/ruby_shogi/perft.rb

@@ -9,18 +9,50 @@ module RubyShogi
 class Perft
 	attr_accessor :board
 	
-	NUMS = { # https://groups.google.com/forum/#!topic/shogi-l/U7hmtThbk1k
-		0 => 1,
-		1 => 30,
-		2 => 900,
-		3 => 25470,
-		4 => 719731,
-		5 => 19861490,
-		6 => 547581517
-	}
+	SUITE = [
+		
+		{ 
+			# https://groups.google.com/forum/#!topic/shogi-l/U7hmtThbk1k
+			"fen" => "lnsgkgsnl/1r5b1/ppppppppp/9/9/9/PPPPPPPPP/1B5R1/LNSGKGSNL[-] w 0 1",
+			"numbers" => [
+				1,
+				30,
+				900,
+				25470,
+				719731,
+				19861490,
+				547581517
+			]
+		},
+		{
+			# http://talkchess.com/forum3/viewtopic.php?f=7&t=32014
+			"fen" => "7lk/9/8S/9/9/9/9/7L1/8K[P] w 0 1",
+			"numbers" => [
+				1,
+				85,
+				639,
+				10786,
+				167089,
+				3458811
+			]
+		},
+		{ 
+			"fen" => "2k6/L8/+b6p1/+b1+b2+n2P/5P1s+N/9/9/7K1/9[LPPpsn] w 0 1",
+			"numbers" => [
+				1,
+				122,
+				26689,
+				0,#2308091,
+				0,
+				0,
+				0
+			]
+		}
+	]
 	
 	def initialize(fen = nil)
-		@board = RubyShogi::Board.new(fen)
+		@board = RubyShogi::Board.new
+		@board.fen2(fen)
 	end
 	
 	def perft_number(depth)
@@ -37,13 +69,36 @@ class Perft
 		n
 	end
 	
-	def randperft(depth)
+	def randperft(depth, i, n)
 		@board = @board.randpos
+		puts "\n[ Round: #{i+1} / #{n} ]"
 		perft(depth)
 	end
 	
+	def perft_by_moves(depth=2)
+		puts "~~~ perft_by_numbers( #{depth} ) ~~~"
+		puts "[ fen: #{@board.pos2fen} ]"
+		total_time = 0
+		total_nodes = 0
+		copy = @board
+		mgen = @board.mgen_generator
+		n, moves = 0, mgen.generate_moves
+		moves.each_with_index do |m, i|
+			@board = m
+			start = Time.now
+			nn = perft_number(depth-1)
+			diff = Time.now - start
+			total_time += diff
+			total_nodes += nn
+			puts "#{i+1}: #{m.move2str}: #{nn}"
+			#break
+		end
+		@board = copy
+		puts "= #{total_nodes} | #{total_time.round(3)}s | #{(total_nodes/total_time).to_i} nps"
+	end
+	
 	def perft(depth)
-		puts "~~~ perft( #{depth} ) ~~~"
+		#puts "~~~ perft( #{depth} ) ~~~"
 		puts "[ fen: #{@board.pos2fen} ]"
 		total_time = 0
 		total_nodes = 0
@@ -62,25 +117,34 @@ class Perft
 		puts "= #{total_nodes} | #{total_time.round(3)}s | #{(total_nodes/total_time).to_i} nps"
 	end
 	
-	def suite(depth)
-		puts "~~~ suite( #{depth} ) ~~~"
-		total_time = 0
-		total_nodes = 0
-		copy = @board
+	def run_suite(data, i2, depth)
+		fen, nums = data["fen"], data["numbers"]
+		puts "[ round: #{i2+1} / #{SUITE.length} ]"
+		puts "[ fen: #{fen} ]"
+		total_nodes, total_time = 0, 0
+		@board = RubyShogi::Board.new
+		@board.fen2(fen)
 		(depth+1).times do |i|
+			break if nums[i] == 0
 			start = Time.now
-			@board = copy
 			n = perft_number(i)
 			diff = Time.now - start
-			total_time += diff
 			total_nodes += n
+			total_time += diff
 			nps = (diff == 0 or n == 1) ? n : (n / diff).to_i
-			error = ["ok", "error"][NUMS[i] - n == 0 ? 0 : 1]
-			break if i >= NUMS.length - 1
+			error = ["ok", "error"][nums[i] - n == 0 ? 0 : 1]
+			break if i >= nums.length - 1
 			puts "#{i}: #{n} | #{diff.round(3)}s | #{nps} nps | #{error}"
 		end
 		total_time = 1 if total_time == 0
-		puts "= #{total_nodes} | #{total_time.round(3)}s | #{(total_nodes/total_time).to_i} nps"
+		puts "= #{total_nodes} | #{total_time.round(3)}s | #{(total_nodes/total_time).to_i} nps\n\n"
+	end
+	
+	def suite(depth)
+		puts "~~~ suite( #{depth} ) ~~~"
+		start = Time.now
+		total_nodes = 0
+		SUITE.each_with_index { |s, i| run_suite(s, i, depth) }
 	end
 end # class Perft
 

data/lib/ruby_shogi/ruby_shogi.rb

@@ -40,7 +40,7 @@ $stderr.reopen("ruby_shogi-error.txt", "a+")
 
 module RubyShogi
 	NAME = "RubyShogi"
-	VERSION = "0.2"
+	VERSION = "0.22"
 	AUTHOR = "Toni Helminen"
 
 	def RubyShogi.init

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: RubyShogi
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.22'
 platform: ruby
 authors:
 - Toni Helminen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-13 00:00:00.000000000 Z
+date: 2019-10-15 00:00:00.000000000 Z
 dependencies: []
 description: RubyShogi, a Shogi Engine
 email: kalleankka1@gmail.com