swttt-gem 1.0.0 → 1.1.0

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/lib/board.rb

@@ -1,5 +1,5 @@
 class Board
-  attr_reader :game_history, :player_value, :row_scores, :dimension,
+  attr_reader :game_history, :player_value, :row_scores, :dimension, :player_one, :player_two,
               :column_scores, :left_diagonal_score, :right_diagonal_score
 
   def initialize(dimension = 3)
@@ -7,18 +7,19 @@ class Board
     @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
+    @player_one, @player_two = 1, -1
   end
 
   def move(row, column, value = nil)
-    @board[row][column] = value || player_value
-    update_sums(row, column, value || player_value)
+    @board[row-1][column-1] = value || player_value
+    update_sums(row-1, column-1, value || player_value)
     @game_history << Move.new(row, column, value || player_value)
   end
 
   def undo_move
     move = @game_history.pop
-    update_sums(move.row, move.column, -player_value)
-    @board[move.row][move.column] = 0
+    update_sums(move.row-1, move.column-1, -player_value)
+    @board[move.row-1][move.column-1] = 0
   end
 
   def number_of_moves_made
@@ -26,11 +27,11 @@ class Board
   end
 
   def value_at(row, column)
-    @board[row][column]
+    @board[row-1][column-1]
   end
 
   def is_empty_at?(row, column)
-    @board[row][column].zero?
+    @board[row-1][column-1].zero?
   end
 
   def full?
@@ -47,6 +48,10 @@ class Board
     return value
   end
 
+  def winner
+    -player_value
+  end
+
   def corner_occupied?
     corner_cells.each { |corner| return true if @game_history.include?(corner) }
     return false
@@ -59,17 +64,17 @@ class Board
 private
 
   def corner_cells
-    [Move.new(0,0),
-     Move.new(0,@dimension-1),
-     Move.new(@dimension-1,0),
-     Move.new(@dimension-1, @dimension-1)]
+    [Move.new(1,1),
+     Move.new(1,@dimension),
+     Move.new(@dimension,1),
+     Move.new(@dimension, @dimension)]
   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 - 1
+    @right_diagonal_score += update_value if row == @dimension - column - 1
   end
 end
 

data/lib/minimax_computer.rb

@@ -40,13 +40,13 @@ private
   end
 
   def middle_move
-    middle = @game_board.dimension/2
+    middle = @game_board.dimension/2 + 1
     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) }
+    (1..@game_board.dimension).each do |row|
+      (1..@game_board.dimension).each { |column| yield(row, column) }
     end
   end
 

data/spec/board_spec.rb

@@ -7,8 +7,8 @@ describe Board do
   end
 
   def iterate_board
-    (0...@my_board.dimension).each do |row|
-      (0...@my_board.dimension).each do |column| 
+    (1..@my_board.dimension).each do |row|
+      (1..@my_board.dimension).each do |column| 
         yield(row, column)
       end
     end
@@ -71,13 +71,13 @@ describe Board do
 
   it "can override the player_value" do
     @my_board.move(1,2,1)
-    @my_board.move(0,0,1)
+    @my_board.move(2,2,1)
     @my_board.player_value.should == 1
   end
 
   it "updates the board when move is called" do
-    @my_board.move(0,0)
-    @my_board.value_at(0,0).should == 1
+    @my_board.move(2,2)
+    @my_board.value_at(2,2).should == 1
   end
 
   it "undos the board" do
@@ -89,7 +89,7 @@ describe Board do
   context "sum values" do
 
     before do
-      @my_board.move(1,1)
+      @my_board.move(2,2)
     end
 
     it "should update row scores" do
@@ -128,16 +128,16 @@ describe Board do
 
   it "detects if a corner cell is occupied" do
     @my_board.corner_occupied?.should be_false
-    @my_board.move(0,0)
+    @my_board.move(1,1)
     @my_board.corner_occupied?.should be_true
     @my_board.undo_move
-    @my_board.move(0,2)
+    @my_board.move(1,3)
     @my_board.corner_occupied?.should be_true
     @my_board.undo_move
-    @my_board.move(2,0)
+    @my_board.move(3,1)
     @my_board.corner_occupied?.should be_true
     @my_board.undo_move
-    @my_board.move(2,2)
+    @my_board.move(3,3)
     @my_board.corner_occupied?.should be_true
   end
 

data/spec/game_observer_spec.rb

@@ -9,16 +9,16 @@ describe GameObserver do
   end
   
   def iterate_row_or_column
-    (0...@my_board.dimension).each { |position| yield(position) }
+    (1..@my_board.dimension).each { |position| yield(position) }
   end
 
   it "detects a horizontal win" do
-    iterate_row_or_column { |column| @my_board.move(0,column,1) }
+    iterate_row_or_column { |column| @my_board.move(1,column,1) }
     @observer.has_winner?.should == true
   end
 
   it "detects a vertical win" do
-    iterate_row_or_column { |row| @my_board.move(row,0,1) }
+    iterate_row_or_column { |row| @my_board.move(row,1,1) }
     @observer.has_winner?.should == true
   end
 
@@ -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-1,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,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{swttt-gem}
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Stephen Walker"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: swttt-gem
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Stephen Walker