swttt-gem 0.5.0 → 0.6.0

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/lib/board.rb

@@ -1,12 +1,12 @@
 class Board
   attr_reader :game_history, :dimension, :game_board, :player_value, :board,
-              :sum_of_row, :sum_of_column, :left_diagonal, :right_diagonal
+              :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]]
-    @sum_of_row, @sum_of_column = [0,0,0], [0,0,0]
-    @left_diagonal, @right_diagonal = 0, 0
+    @row_scores, @column_scores = [0,0,0], [0,0,0]
+    @left_diagonal_score, @right_diagonal_score = 0, 0
   end
 
   def move(row, column, value = nil)
@@ -60,10 +60,10 @@ private
   end
 
   def update_sums(row, column, update_value)
-    @sum_of_row[row] += update_value
-    @sum_of_column[column] += update_value
-    @left_diagonal += update_value if row == column
-    @right_diagonal += update_value if row == @dimension - column - 1
+    @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
   end
 end
 

data/lib/game_observer.rb

@@ -20,15 +20,15 @@ private
   end
 
   def horizontal_win?
-    loop_array { |row| @game_board.sum_of_row[row].abs }
+    loop_array { |row| @game_board.row_scores[row].abs }
   end
 
   def vertical_win?
-    loop_array { |column| @game_board.sum_of_column[column].abs }
+    loop_array { |column| @game_board.column_scores[column].abs }
   end
 
   def diagonal_win?
-    (@game_board.left_diagonal.abs == @game_board.dimension ||
-     @game_board.right_diagonal.abs == @game_board.dimension)
+    (@game_board.left_diagonal_score.abs == @game_board.dimension ||
+     @game_board.right_diagonal_score.abs == @game_board.dimension)
   end
 end

data/lib/minimax_computer.rb

@@ -11,11 +11,12 @@ class MinimaxComputer
 
   def move(iteration = 0)
     if first_move?
-      move = first_move
-      return @game_board.move(move.row, move.column)
+      make_first_move
+    elsif @observer.game_over?
+      return path_score_result if iteration > 0
+    else
+      perform_mini_max(iteration)
     end
-    return path_score_result if @observer.game_over?
-    mini_max(iteration)
   end
 
 private
@@ -24,7 +25,12 @@ private
     @game_board.number_of_moves_made < 2
   end
 
-  def first_move
+  def make_first_move
+    move = select_first_move
+    @game_board.move(move.row, move.column)
+  end
+
+  def select_first_move
     if !@first_move.include?(@game_board.game_history.first)
       move = @first_move[rand(@first_move.size)]
     else
@@ -38,13 +44,13 @@ private
     return 0
   end
 
-  def mini_max(iteration)
+  def perform_mini_max(iteration)
     best_moves = BestMove.new(@game_board, @my_player_value)
     for_each_cell { |row, column| best_moves.add_better_move(best_moves.value, 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
-    @game_board.move(move.row, move.column) if !@observer.game_over?
+    @game_board.move(move.row, move.column)
   end
 
    def for_each_cell

data/spec/board_spec.rb

@@ -97,33 +97,33 @@ describe Board do
       @my_board.move(1,1)
     end
 
-    it "should update sum of row" do
-      @my_board.sum_of_row[1].should == 1
+    it "should update row scores" do
+      @my_board.row_scores[1].should == 1
     end
 
-    it "should update sum of column" do
-      @my_board.sum_of_column[1].should == 1
+    it "should update column scores" do
+      @my_board.column_scores[1].should == 1
     end
 
-    it "should update the diagonals" do
-      @my_board.left_diagonal.should == 1
-      @my_board.right_diagonal.should == 1
+    it "should update the diagonal scores" do
+      @my_board.left_diagonal_score.should == 1
+      @my_board.right_diagonal_score.should == 1
     end
 
-    it "should undo sum of row" do
+    it "should undo row scores" do
       @my_board.undo_move
-      @my_board.sum_of_row[1].should == 0
+      @my_board.row_scores[1].should == 0
     end
 
-    it "should undo sum of column" do
+    it "should undo column scores" do
       @my_board.undo_move
-      @my_board.sum_of_column[1].should == 0
+      @my_board.column_scores[1].should == 0
     end
 
-    it "should undo diagonals" do
+    it "should undo diagonal scores" do
       @my_board.undo_move
-      @my_board.left_diagonal.should == 0
-      @my_board.right_diagonal.should == 0
+      @my_board.left_diagonal_score.should == 0
+      @my_board.right_diagonal_score.should == 0
     end
   end
 end

data/spec/minimax_computer_spec.rb

@@ -24,4 +24,14 @@ describe MinimaxComputer do
     @observer.game_over?.should be_true
     @observer.has_winner?.should be_false
   end
+
+  it "takes an immediate win" do
+    @my_board.move(1,0)
+    @my_board.move(2,2)
+    @my_board.move(1,1)
+    @my_board.move(1,2)
+    @my_board.move(0,0)
+    @computer.move
+    @observer.has_winner?.should be_true
+  end
 end

data/swttt-gem.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{swttt-gem}
-  s.version = "0.5.0"
+  s.version = "0.6.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-03}
+  s.date = %q{2011-05-04}
   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: 11
+  hash: 7
   prerelease: 
   segments: 
   - 0
-  - 5
+  - 6
   - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Stephen Walker
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-03 00:00:00 -05:00
+date: 2011-05-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency