swttt-gem 0.7.0 → 0.8.0

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.8.0

data/lib/board.rb

@@ -1,11 +1,11 @@
 class Board
-  attr_reader :game_history, :dimension, :game_board, :player_value, :board,
-              :row_scores, :column_scores, :left_diagonal_score, :right_diagonal_score
+  attr_reader :game_history, :game_board, :player_value, :board, :row_scores,
+              :column_scores, :left_diagonal_score, :right_diagonal_score
 
   def initialize(dimension = 3)
     @dimension = dimension
-    @game_history, @board = [], [[0,0,0],[0,0,0],[0,0,0]]
-    @row_scores, @column_scores = [0,0,0], [0,0,0]
+    @game_history, @board = [], Array.new(@dimension) {Array.new(@dimension) {0}}
+    @row_scores, @column_scores = Array.new(@dimension) {0}, Array.new(@dimension) {0}
     @left_diagonal_score, @right_diagonal_score = 0, 0
   end
 
@@ -33,6 +33,10 @@ class Board
     @game_history.size == @dimension*@dimension
   end
 
+  def dimension
+    @dimension-1
+  end
+
   def player_value
     value = -(number_of_moves_made % 2)
     value = 1 if value.zero?
@@ -40,7 +44,7 @@ class Board
   end
 
   def print
-    (0...@dimension).each { |row| print_row(row) }
+    (0..@dimension).each { |row| print_row(row) }
     puts "\n"
   end
 
@@ -48,7 +52,7 @@ private
 
   def print_row(row)
     puts "\n"
-    (0...@dimension).each { |column| print_square(row, column) }
+    (0..@dimension).each { |column| print_square(row, column) }
   end
 
   def print_square(row, column)
@@ -63,7 +67,7 @@ private
     @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 - 1
+    @right_diagonal_score += update_value if row == dimension - column
   end
 end
 

data/lib/game_observer.rb

@@ -14,21 +14,25 @@ class GameObserver
 
 private
 
-  def loop_array
-    (0...@game_board.dimension).each { |index| return true if yield(index) == @game_board.dimension }
-    false
-  end
-
   def horizontal_win?
-    loop_array { |row| @game_board.row_scores[row].abs }
+    check_for_winner { |row| @game_board.row_scores[row].abs }
   end
 
   def vertical_win?
-    loop_array { |column| @game_board.column_scores[column].abs }
+    check_for_winner { |column| @game_board.column_scores[column].abs }
   end
 
   def diagonal_win?
-    (@game_board.left_diagonal_score.abs == @game_board.dimension ||
-     @game_board.right_diagonal_score.abs == @game_board.dimension)
+    (is_a_win?(@game_board.left_diagonal_score.abs) ||
+     is_a_win?(@game_board.right_diagonal_score.abs))
+  end
+
+  def check_for_winner
+    (0..@game_board.dimension).each { |index| return true if is_a_win?(yield(index)) }
+    false
+  end
+
+  def is_a_win?(value)
+    value == @game_board.dimension+1
   end
 end

data/lib/minimax_computer.rb

@@ -3,9 +3,9 @@ class MinimaxComputer
   def initialize(board, observer)
     @game_board, @observer = board, observer
     @first_move = [Move.new(0,0),
-                   Move.new(0,@game_board.dimension-1),
-                   Move.new(@game_board.dimension-1,0),
-                   Move.new(@game_board.dimension-1, @game_board.dimension-1)]
+                   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
 
@@ -29,12 +29,21 @@ private
   end
 
   def select_first_move
-    if !@first_move.include?(@game_board.game_history.first)
-      move = @first_move[rand(@first_move.size)]
-    else
-      middle = @game_board.dimension/2
-      move = Move.new(middle, middle)
-    end
+    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)
@@ -43,13 +52,13 @@ private
     for_each_cell { |row, column| best_moves.add_better_move(best_moves.value, 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.random
+    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) }
+    (0..@game_board.dimension).each do |row|
+      (0..@game_board.dimension).each { |column| yield(row, column) }
     end
   end
 
@@ -90,7 +99,7 @@ class BestMove
     @game_board, @my_player_value = game_board, my_player_value
   end
 
-  def random
+  def get_random_move
     @moves[rand(@moves.size)]
   end
 

data/spec/board_spec.rb

@@ -6,9 +6,9 @@ describe Board do
     @my_board = Board.new
   end
 
-  def double_loop
-    (0...@my_board.dimension).each do |row|
-      (0...@my_board.dimension).each do |column| 
+  def iterate_board
+    (0..@my_board.dimension).each do |row|
+      (0..@my_board.dimension).each do |column| 
         yield(row, column)
       end
     end
@@ -19,7 +19,7 @@ describe Board do
   end
 
   it "should check for a full board" do
-    double_loop { |row, column| @my_board.move(row, column) }
+    iterate_board { |row, column| @my_board.move(row, column) }
     @my_board.full?.should == true
   end
 

data/spec/game_observer_spec.rb

@@ -8,32 +8,32 @@ describe GameObserver do
     @observer = GameObserver.new(@my_board)
   end
   
-  def loop
-    (0...@my_board.dimension).each { |position| yield(position) }
+  def iterate_row_or_column
+    (0..@my_board.dimension).each { |position| yield(position) }
   end
 
   it "detects a horizontal win" do
-    loop { |column| @my_board.move(0,column,1) }
+    iterate_row_or_column { |column| @my_board.move(0,column,1) }
     @observer.has_winner?.should == true
   end
 
   it "detects a vertical win" do
-    loop { |row| @my_board.move(row,0,1) }
+    iterate_row_or_column { |row| @my_board.move(row,0,1) }
     @observer.has_winner?.should == true
   end
 
   it "detects a left diagonal win" do
-    loop { |position| @my_board.move(position,position,1) }
+    iterate_row_or_column { |position| @my_board.move(position,position,1) }
     @observer.has_winner?.should == true
   end
 
   it "detects a right diagonal win" do
-    loop { |position| @my_board.move(@my_board.dimension-position-1,position,1) }
+    iterate_row_or_column { |position| @my_board.move(@my_board.dimension-position,position,1) }
     @observer.has_winner?.should == true
   end
 
   it "detects if the game is over" do
-    loop { |row| loop { |column| @my_board.move(row, column, 2) } }
+    iterate_row_or_column { |row| iterate_row_or_column { |column| @my_board.move(row, column, 2) } }
     @observer.game_over?.should == true
   end
 end

data/swttt-gem.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{swttt-gem}
-  s.version = "0.7.0"
+  s.version = "0.8.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-04}
+  s.date = %q{2011-05-09}
   s.description = %q{TTT Gem}
   s.email = %q{stephenwalker1988@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: swttt-gem
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 63
   prerelease: 
   segments: 
   - 0
-  - 7
+  - 8
   - 0
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Stephen Walker
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-04 00:00:00 -05:00
+date: 2011-05-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency