swttt-gem 0.9.0 → 1.0.0

data/VERSION

@@ -1 +1 @@
-0.9.0
+1.0.0

data/lib/board.rb

@@ -1,5 +1,5 @@
 class Board
-  attr_reader :game_history, :game_board, :player_value, :board, :row_scores,
+  attr_reader :game_history, :player_value, :row_scores, :dimension,
               :column_scores, :left_diagonal_score, :right_diagonal_score
 
   def initialize(dimension = 3)
@@ -25,6 +25,10 @@ class Board
     @game_history.size
   end
 
+  def value_at(row, column)
+    @board[row][column]
+  end
+
   def is_empty_at?(row, column)
     @board[row][column].zero?
   end
@@ -33,8 +37,8 @@ class Board
     @game_history.size == @dimension*@dimension
   end
 
-  def dimension
-    @dimension-1
+  def winning_value
+    @dimension
   end
 
   def player_value
@@ -43,31 +47,29 @@ class Board
     return value
   end
 
-  def print
-    (0...@dimension).each { |row| print_row(row) }
-    puts "\n"
+  def corner_occupied?
+    corner_cells.each { |corner| return true if @game_history.include?(corner) }
+    return false
   end
 
-private
-
-  def print_row(row)
-    puts "\n"
-    (0...@dimension).each { |column| print_square(row, column) }
+  def random_corner_cell
+    corner_cells[rand(corner_cells.size)]
   end
 
-  def print_square(row, column)
-    putc "["
-    putc "X" if @board[row][column] == 1
-    putc"O" if @board[row][column] == -1
-    putc " " if @board[row][column].zero?
-    putc "]"
+private
+
+  def corner_cells
+    [Move.new(0,0),
+     Move.new(0,@dimension-1),
+     Move.new(@dimension-1,0),
+     Move.new(@dimension-1, @dimension-1)]
   end
 
   def update_sums(row, column, update_value)
     @row_scores[row] += update_value
     @column_scores[column] += update_value
     @left_diagonal_score += update_value if row == column
-    @right_diagonal_score += update_value if row == dimension - column
+    @right_diagonal_score += update_value if row == dimension - column - 1
   end
 end
 

data/lib/game_observer.rb

@@ -28,11 +28,11 @@ private
   end
 
   def check_for_winner
-    (0..@game_board.dimension).each { |index| return true if is_a_win?(yield(index)) }
-    false
+    (0...@game_board.dimension).each { |index| return true if is_a_win?(yield(index)) }
+    return false
   end
 
   def is_a_win?(value)
-    value == @game_board.dimension+1
+    value == @game_board.winning_value
   end
 end

data/lib/minimax_computer.rb

@@ -2,10 +2,6 @@ class MinimaxComputer
 
   def initialize(board, observer)
     @game_board, @observer = board, observer
-    @first_move = [Move.new(0,0),
-                   Move.new(0,@game_board.dimension),
-                   Move.new(@game_board.dimension,0),
-                   Move.new(@game_board.dimension, @game_board.dimension)]
     @my_player_value = @game_board.player_value
   end
 
@@ -28,37 +24,29 @@ private
     @game_board.move(move.row, move.column)
   end
 
-  def select_first_move
-    return corner_move if all_board_corners_open?
-    return middle_move
-  end
-
-  def all_board_corners_open?
-    !@first_move.include?(@game_board.game_history.first)
-  end
-
-  def corner_move
-    @first_move[rand(@first_move.size)]
-  end
-
-  def middle_move
-    middle = @game_board.dimension/2
-    return move = Move.new(middle, middle)
-  end
-
   def perform_mini_max(iteration)
     return path_score if @observer.game_over?
     best_moves = BestMove.new(@game_board, @my_player_value)
-    for_each_cell { |row, column| best_moves.add_better_move(best_moves.value, calculate_path_score(row, column,iteration),
+    for_each_cell { |row, column| best_moves.add_better_move(calculate_path_score(row, column,iteration),
                                   Move.new(row, column)) if @game_board.is_empty_at?(row, column) }
     return best_moves.value if !iteration.zero?
     move = best_moves.get_random_move
     @game_board.move(move.row, move.column)
   end
 
-   def for_each_cell
-    (0..@game_board.dimension).each do |row|
-      (0..@game_board.dimension).each { |column| yield(row, column) }
+  def select_first_move
+    return @game_board.random_corner_cell if !@game_board.corner_occupied?
+    return middle_move
+  end
+
+  def middle_move
+    middle = @game_board.dimension/2
+    return move = Move.new(middle, middle)
+  end
+
+  def for_each_cell
+    (0...@game_board.dimension).each do |row|
+      (0...@game_board.dimension).each { |column| yield(row, column) }
     end
   end
 
@@ -103,16 +91,16 @@ class BestMove
     @moves[rand(@moves.size)]
   end
 
-  def add_better_move(best_score, path_score, move)
-    if better_or_equal_move?(best_score, path_score)
+  def add_better_move(path_score, move)
+    if better_or_equal_move?(path_score)
       @moves.clear and @value = path_score if path_score !=  @value
       @moves << move
     end
   end
 
-  def better_or_equal_move?(best_score, path_score)
-    (best_score.nil?) or
-    (path_score >= best_score && @game_board.player_value == @my_player_value) or
-    (path_score <= best_score && @game_board.player_value != @my_player_value)
+  def better_or_equal_move?(path_score)
+    (@value.nil?) or
+    (path_score >= @value && @game_board.player_value == @my_player_value) or
+    (path_score <= @value && @game_board.player_value != @my_player_value)
   end
 end

data/spec/board_spec.rb

@@ -7,20 +7,20 @@ describe Board do
   end
 
   def iterate_board
-    (0..@my_board.dimension).each do |row|
-      (0..@my_board.dimension).each do |column| 
+    (0...@my_board.dimension).each do |row|
+      (0...@my_board.dimension).each do |column| 
         yield(row, column)
       end
     end
   end
 
   it "should create a board" do
-    @my_board.nil?.should == false
+    @my_board.nil?.should be_false
   end
 
   it "should check for a full board" do
     iterate_board { |row, column| @my_board.move(row, column) }
-    @my_board.full?.should == true
+    @my_board.full?.should be_true
   end
 
   context "game history" do
@@ -75,20 +75,15 @@ describe Board do
     @my_board.player_value.should == 1
   end
 
-  it "has a 3x3 board" do
-    @my_board.board.size.should == 3
-    @my_board.board[1].size.should == 3
-  end
-
   it "updates the board when move is called" do
     @my_board.move(0,0)
-    @my_board.board[0][0].should == 1
+    @my_board.value_at(0,0).should == 1
   end
 
   it "undos the board" do
     @my_board.move(2,2)
     @my_board.undo_move
-    @my_board.board[2][2].should == 0
+    @my_board.value_at(2,2).should == 0
   end
 
   context "sum values" do
@@ -126,4 +121,29 @@ describe Board do
       @my_board.right_diagonal_score.should == 0
     end
   end
+
+  it "has a winning value" do
+    @my_board.winning_value.should == 3
+  end
+
+  it "detects if a corner cell is occupied" do
+    @my_board.corner_occupied?.should be_false
+    @my_board.move(0,0)
+    @my_board.corner_occupied?.should be_true
+    @my_board.undo_move
+    @my_board.move(0,2)
+    @my_board.corner_occupied?.should be_true
+    @my_board.undo_move
+    @my_board.move(2,0)
+    @my_board.corner_occupied?.should be_true
+    @my_board.undo_move
+    @my_board.move(2,2)
+    @my_board.corner_occupied?.should be_true
+  end
+
+  it "returns a random corner cell" do
+    move = @my_board.random_corner_cell
+    @my_board.move(move.row, move.column)
+    @my_board.corner_occupied?.should be_true
+  end
 end

data/spec/game_observer_spec.rb

@@ -9,7 +9,7 @@ describe GameObserver do
   end
   
   def iterate_row_or_column
-    (0..@my_board.dimension).each { |position| yield(position) }
+    (0...@my_board.dimension).each { |position| yield(position) }
   end
 
   it "detects a horizontal win" do
@@ -28,7 +28,7 @@ describe GameObserver do
   end
 
   it "detects a right diagonal win" do
-    iterate_row_or_column { |position| @my_board.move(@my_board.dimension-position,position,1) }
+    iterate_row_or_column { |position| @my_board.move(@my_board.dimension-position-1,position,1) }
     @observer.has_winner?.should == true
   end
 

data/swttt-gem.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{swttt-gem}
-  s.version = "0.9.0"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Stephen Walker"]
-  s.date = %q{2011-05-09}
+  s.date = %q{2011-05-11}
   s.description = %q{TTT Gem}
   s.email = %q{stephenwalker1988@gmail.com}
   s.extra_rdoc_files = [
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
+    "lib/.DS_Store",
     "lib/board.rb",
     "lib/game_observer.rb",
     "lib/human_player.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: swttt-gem
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 23
   prerelease: 
   segments: 
+  - 1
   - 0
-  - 9
   - 0
-  version: 0.9.0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Stephen Walker
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-09 00:00:00 -05:00
+date: 2011-05-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -96,6 +96,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- lib/.DS_Store
 - lib/board.rb
 - lib/game_observer.rb
 - lib/human_player.rb