reversi 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dde2e7d7a4f73ef89fbdc626ff5f06d22e0451fa
-  data.tar.gz: d3d2a7f4eea6769ea366c8cd3a1a059238cbf0f4
+  metadata.gz: 651aae750b3b767bc9375470adff0bb5414f0663
+  data.tar.gz: b90881770c721b08e945d7f20b3433bf97437115
 SHA512:
-  metadata.gz: 96c2d82cfb35399f3951b62c08a18d024b564a146d588311ce3ef1790d512be2d9d77e1def514be5fd23dae97509a979cfb5308c9b03a2e92d55365a5375fefa
-  data.tar.gz: 32d24821205506520d37fec291679fa21ca5e30369bdafa1ed5f7a8772008f9b207189864ce286f9a2dd16b23030b2af11ddafa4d680ec7287bd6580e4536ba2
+  metadata.gz: 85398b003393d63e49e37bbdf9e59958d2e3cdf49d9d787b4bd95dfd1261d2498b7b1f217a21909ddd283ab59f12893d5f909294dda5887bf5d5ba375ec5067e
+  data.tar.gz: 81821d25c301e6e18a0bda8088a730558ec96a00e0317eb104e03fbd83f2de2b8b4601d7bd5a0629c254d52c583b493cc21b8b57bca6f36c916b8a5a8056952c

data/README.md

@@ -47,18 +47,21 @@ Use `Reversi.configure` to configure setting for a reversi game.
 
 `name` description... (default value)  
 
-* `player_b` A player having the first move uses this class object. (Reversi::Player::RandomAI)
-* `player_w` A player having the passive move uses this class object. (Reversi::Player::RandomAI)
-* `disk_b` A string of the black disks. ('b')
-* `disk_w` A string of the black disks. ('w')
-* `disk_color_b` A color of the black disks. (0)
-* `disk_color_w` A color of the black disks. (0)
-* `progress` Whether or not the progress of the game is displayed. (false)
-* `stack_limit` The upper limit number of times of use `Reversi::Board#undo!` . (3)
+* `player_b` A player having the first move uses this class object. ( Reversi::Player::RandomAI )
+* `player_w` A player having the passive move uses this class object. ( Reversi::Player::RandomAI )
+* `disk_b` A string of the black disks. ( 'b' )
+* `disk_w` A string of the black disks. ( 'w' )
+* `disk_color_b` A color of the black disks. ( 0 )
+* `disk_color_w` A color of the black disks. ( 0 )
+* `initial_position` The initial positions of each disk on the board. ( {:black => [[:d, 5], [:e, 4]], :white => [[:d, 4], [:e, 5]]} )
+* `progress` Whether or not the progress of the game is displayed. ( false )
+* `stack_limit` The upper limit number of times of use `Reversi::Board#undo!` . ( 3 )
 
 A string and a color of the disks are reflected on `game.board.to_s` .  
 You can choose from 9 colors, black, red, green, yellow, blue, magenda, cyan, white and gray.  
 
+Using `Reversi.reset` method, you can reset all options to the default values.
+
 ### Human vs Computer
 
 Set `Reversi::Player::Human` to player_b or player_w, and run. Please input your move (for example: d3). This program is terminated when this game is over or when you input `q` or `exit`.  
@@ -72,7 +75,7 @@ game = Reversi::Game.new
 game.start
 ```
 
-### My AI
+### Your Original Player
 
 You can make your original player class by inheriting `Reversi::Player::BasePlayer` and defining `move` method.  
 

data/lib/reversi/board.rb

@@ -32,13 +32,14 @@ module Reversi
       @options = options
       @stack = []
       [:disk_color_b, :disk_color_w].each do |color|
-        if options[color].is_a?(Symbol) || options[color].is_a?(String)
-          options[color] = DISK_COLOR[options[color].to_sym].to_i
+        if @options[color].is_a?(Symbol) || @options[color].is_a?(String)
+          @options[color] = DISK_COLOR[@options[color].to_sym].to_i
         end
       end
       @columns = (0..9).map{ (0..9).map{ |_| DISK[:none] } }
-      put_disk(4, 4, :white); put_disk(5, 5, :white)
-      put_disk(4, 5, :black); put_disk(5, 4, :black)
+      @options[:initial_position].each do |color, positions|
+        positions.each{ |position| put_disk(*position, color) }
+      end
       @columns.each do |col|
         col[0] = 2; col[-1] = 2
       end.tap do |cols|
@@ -50,7 +51,7 @@ module Reversi
     #
     # @return [String]
     def to_s
-      "     #{(:a..:h).to_a.map(&:to_s).join("   ")}\n" <<
+      "     #{[*'a'..'h'].join("   ")}\n" <<
       "   #{"+---"*8}+\n" <<
       @columns[1][1..-2].zip(*@columns[2..8].map{ |col| col[1..-2] })
       .map{ |row| row.map do |e|
@@ -61,7 +62,7 @@ module Reversi
         end
       end
       .map{ |e| "| #{e} |" }.join }.map{ |e| e.gsub(/\|\|/, "|") }
-      .tap{ |rows| break (0..7).to_a.map{ |i| " #{i+1} " << rows[i] } }
+      .tap{ |rows| break [*0..7].map{ |i| " #{i+1} " << rows[i] } }
       .join("\n   #{"+---"*8}+\n") <<
       "\n   #{"+---"*8}+\n"
     end
@@ -69,6 +70,7 @@ module Reversi
     # Pushes an array of the game board onto a stack.
     # The stack size limit is 3(default).
     def push_stack
+      x = [*:a..:h].index(x) + 1 if x.is_a? Symbol
       @stack.push(Marshal.load(Marshal.dump(@columns)))
       @stack.shift if @stack.size > @options[:stack_limit]
     end
@@ -96,7 +98,7 @@ module Reversi
     # @param y [Integer] the row number
     # @return [Integer] the openness
     def openness(x, y)
-      x = (:a..:h).to_a.index(x) + 1 if x.is_a? Symbol
+      x = [*:a..:h].index(x) + 1 if x.is_a? Symbol
       ([-1,0,1].product([-1,0,1]) - [[0, 0]]).inject(0) do |sum, (dx, dy)|
         sum + (@columns[x + dx][y + dy] == 0 ? 1 : 0)
       end
@@ -108,7 +110,7 @@ module Reversi
     # @param y [Integer] the row number
     # @return [Symbol] the color or `:none`
     def at(x, y)
-      x = (:a..:h).to_a.index(x) + 1 if x.is_a? Symbol
+      x = [*:a..:h].index(x) + 1 if x.is_a? Symbol
       DISK.key(@columns[x][y])
     end
 
@@ -139,7 +141,7 @@ module Reversi
     # @param y [Integer] the row number
     # @param color [Symbol]
     def put_disk(x, y, color)
-      x = (:a..:h).to_a.index(x) + 1 if x.is_a? Symbol
+      x = [*:a..:h].index(x) + 1 if x.is_a? Symbol
       @columns[x][y] = DISK[color.to_sym]
     end
 
@@ -150,10 +152,9 @@ module Reversi
     # @param y [Integer] the row number
     # @param color [Symbol]
     def flip_disks(x, y, color)
-      x = (:a..:h).to_a.index(x) + 1 if x.is_a? Symbol
+      x = [*:a..:h].index(x) + 1 if x.is_a? Symbol
       [-1,0,1].product([-1,0,1]).each do |dx, dy|
         next if dx == 0 && dy == 0
-        # 隣接石が異色であったらflippable?でひっくり返せるか（挟まれているか）確認
         if @columns[x + dx][y + dy] == DISK[color]*(-1)
           flip_disk(x, y, dx, dy, color) if flippable?(x, y, dx, dy, color)
         end
@@ -184,7 +185,7 @@ module Reversi
     # @param color [Symbol]
     # @return [Boolean]
     def puttable?(x, y, color)
-      x = (:a..:h).to_a.index(x) + 1 if x.is_a? Symbol
+      x = [*:a..:h].index(x) + 1 if x.is_a? Symbol
       return false if @columns[x][y] != 0
       [-1,0,1].product([-1,0,1]).each do |dx, dy|
         next if dx == 0 && dy == 0

data/lib/reversi/configuration.rb

@@ -8,10 +8,23 @@ module Reversi
       :disk_w,
       :disk_color_b,
       :disk_color_w,
+      :initial_position,
       :progress,
       :stack_limit
     ].freeze
 
+    DEFAULTS = {
+      :player_b => Reversi::Player::RandomAI,
+      :player_w => Reversi::Player::RandomAI,
+      :disk_b => 'b',
+      :disk_w => 'w',
+      :disk_color_b => 0,
+      :disk_color_w => 0,
+      :initial_position => {:black => [[:d, 5], [:e, 4]], :white => [[:d, 4], [:e, 5]]},
+      :progress => false,
+      :stack_limit => 3
+    }
+
     attr_accessor *OPTIONS_KEYS
 
     def configure
@@ -22,15 +35,18 @@ module Reversi
       Hash[*OPTIONS_KEYS.map{|key| [key, send(key)]}.flatten]
     end
 
+    def reset
+      DEFAULTS.each do |option, default|
+        self.send("#{option}=".to_sym, default)
+      end
+    end
+
     def set_defaults
-      self.player_b     ||= Reversi::Player::RandomAI
-      self.player_w     ||= Reversi::Player::RandomAI
-      self.disk_b       ||= "b"
-      self.disk_w       ||= "w"
-      self.disk_color_b ||= 0
-      self.disk_color_w ||= 0
-      self.progress     ||= false
-      self.stack_limit  ||= 3
+      DEFAULTS.each do |option, default|
+        default.class == String ?
+        eval("self.#{option} ||= \'#{default}\'") :
+        eval("self.#{option} ||= #{default}")
+      end
     end
   end
 end

data/lib/reversi/player/base_player.rb

@@ -23,10 +23,7 @@ module Reversi::Player
       @board.push_stack
       color = my_color ? @my_color : @opponent_color
       x = (:a..:h).to_a.index(x) + 1 if x.is_a? Symbol
-      diff = flip_disks(x, y, color)
-      if diff.empty?
-        raise Reversi::MoveError, "A player must flip at least one or more opponent's disks."
-      end
+      flip_disks(x, y, color)
       @board.put_disk(x, y, color)
     end
 

data/lib/reversi/player/negamax_ai.rb

@@ -1,5 +1,5 @@
 module Reversi::Player
-  class NegamaxAI < Reversi::Player::BasePlayer
+  class NegamaxAI < BasePlayer
 
     POINT = {
       [:a, 1] => 100, [:b, 1] => -10, [:c, 1] =>  0, [:d, 1] => -1, [:e, 1] => -1, [:f, 1] =>  0, [:g, 1] => -10, [:h, 1] => 100,

data/lib/reversi/version.rb

@@ -1,3 +1,3 @@
 module Reversi
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/base_player_spec.rb

@@ -12,12 +12,6 @@ describe Reversi::Player::BasePlayer do
       end
     end
 
-    context "when a player make an invalid move" do
-      it "Reversi::MoveError raised" do
-        expect{ player.put_disk(:a, 1) }.to raise_error Reversi::MoveError
-      end
-    end
-
     context "when the third argument is `false`" do
       it "makes a opponent's move" do
         expect{ player.put_disk(:e, 3, false) }.to change{ board.status[:white].size }.by(2)

data/spec/board_spec.rb

@@ -8,6 +8,8 @@ describe Reversi::Board do
      :disk_w => "w",
      :disk_color_b => disk_color_b,
      :disk_color_w => disk_color_w,
+     :initial_position => {:black => [[:d, 5], [:e, 4]],
+                           :white => [[:d, 4], [:e, 5]]},
      :progress => false,
      :stack_limit => 3}
   end
@@ -33,6 +35,35 @@ describe Reversi::Board do
     end
   end
 
+  describe "#to_s" do
+    let(:disk_color_b) { :black }
+    let(:disk_color_w) { 'white' }
+
+    it do
+      str = <<-END.gsub(/ {6}/,"")
+           a   b   c   d   e   f   g   h
+         +---+---+---+---+---+---+---+---+
+       1 |   |   |   |   |   |   |   |   |
+         +---+---+---+---+---+---+---+---+
+       2 |   |   |   |   |   |   |   |   |
+         +---+---+---+---+---+---+---+---+
+       3 |   |   |   |   |   |   |   |   |
+         +---+---+---+---+---+---+---+---+
+       4 |   |   |   | \e[37mw\e[0m | \e[30mb\e[0m |   |   |   |
+         +---+---+---+---+---+---+---+---+
+       5 |   |   |   | \e[30mb\e[0m | \e[37mw\e[0m |   |   |   |
+         +---+---+---+---+---+---+---+---+
+       6 |   |   |   |   |   |   |   |   |
+         +---+---+---+---+---+---+---+---+
+       7 |   |   |   |   |   |   |   |   |
+         +---+---+---+---+---+---+---+---+
+       8 |   |   |   |   |   |   |   |   |
+         +---+---+---+---+---+---+---+---+
+      END
+      expect(board.to_s).to eq str
+    end
+  end
+
   describe "#push_stack" do
     let(:disk_color_b) { 0 }
     let(:disk_color_w) { 0 }

data/spec/game_spec.rb

@@ -34,6 +34,35 @@ describe Reversi::Game do
     end
   end
 
+  describe "initial position" do
+    it "default" do
+      game = Reversi::Game.new
+      expect(game.board.at(:e, 4)).to eq :black
+      expect(game.board.at(:d, 4)).to eq :white
+    end
+
+    it "original position" do
+      initial = {:black => [[:a, 1]], :white => [[:h, 8]]}
+      options = {:initial_position => initial}
+      game = Reversi::Game.new(options)
+      expect(game.board.at(:d, 4)).to eq :none
+      expect(game.board.at(:a, 1)).to eq :black
+      expect(game.board.at(:h, 8)).to eq :white
+    end
+  end
+
+  describe "Reversi.reset" do
+    it "reset all options to the default values" do
+      Reversi.configure{ |config| config.progress = true }
+      game = Reversi::Game.new
+      expect(game.options[:progress]).to eq true
+
+      Reversi.reset
+      game = Reversi::Game.new
+      expect(game.options[:progress]).to eq false
+    end
+  end
+
   describe "from a record of a reversi game" do
     game = Reversi::Game.new
     game.player_b.put_disk(:c, 4); game.player_w.put_disk(:e, 3)

data/spec/player_spec.rb

@@ -0,0 +1,70 @@
+require 'spec_helper'
+
+class ValidPlayer < Reversi::Player::BasePlayer
+  def move(board)
+    moves = next_moves.map{ |v| v[:move] }
+    put_disk(*moves.sample) unless moves.empty?
+  end
+end
+
+class InvalidPlayer1 < Reversi::Player::BasePlayer
+  def move(board)
+    put_disk(:a, 1)
+  end
+end
+
+class InvalidPlayer2 < Reversi::Player::BasePlayer
+  def move(board)
+    put_disk(:d, 4)
+  end
+end
+
+class InvalidPlayer3 < Reversi::Player::BasePlayer
+  def move(board)
+    put_disk(:a, 1)
+    put_disk(:a, 2)
+  end
+end
+
+describe Reversi::Player do
+  let(:game) { Reversi::Game.new }
+
+  describe ValidPlayer do
+    it "exit successfully" do
+      Reversi.configure do |config|
+        config.player_b = ValidPlayer
+      end
+      expect(game.start).to eq nil
+    end
+  end
+
+  describe InvalidPlayer1 do
+    it "should raise Reversi::MoveError" do
+      Reversi.configure do |config|
+        config.player_b = InvalidPlayer1
+      end
+      message = "A player must flip at least one or more opponent's disks."
+      expect{ game.start }.to raise_error(Reversi::MoveError, message)
+    end
+  end
+
+  describe InvalidPlayer2 do
+    it "should raise Reversi::MoveError" do
+      Reversi.configure do |config|
+        config.player_b = InvalidPlayer2
+      end
+      message = "When a player can't make a valid move, you must not place a new disk."
+      expect{ game.start }.to raise_error(Reversi::MoveError, message)
+    end
+  end
+
+  describe InvalidPlayer3 do
+    it "should raise Reversi::MoveError" do
+      Reversi.configure do |config|
+        config.player_b = InvalidPlayer3
+      end
+      message = "A player must place a new disk on the board."
+      expect{ game.start }.to raise_error(Reversi::MoveError, message)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reversi
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - seinosuke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -54,6 +54,7 @@ files:
 - spec/base_player_spec.rb
 - spec/board_spec.rb
 - spec/game_spec.rb
+- spec/player_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/seinosuke/reversi
 licenses:
@@ -83,5 +84,6 @@ test_files:
 - spec/base_player_spec.rb
 - spec/board_spec.rb
 - spec/game_spec.rb
+- spec/player_spec.rb
 - spec/spec_helper.rb
 has_rdoc: