ttt_gem_8thlight 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f2cc3c477ba387aba5c0d1a49590249051f958e
-  data.tar.gz: f7b45c9722117b062a91a92e06d52f1d0533e8e6
+  metadata.gz: ca1b97f0a33561487272e06ca4f1a0b72780ffbb
+  data.tar.gz: 28499f2ae30528728c6598e16da377bc8d71f0fc
 SHA512:
-  metadata.gz: 2203e97b566a66d277637e3e37c253c96941f9431ff4fe39e1bced9c1a2400b443698e446cb76190e5c4dd92eb612171404347d5ad5e79ee197ca450fb271e35
-  data.tar.gz: e0dca17b9f0d13ebcb164a540a6638de9727ed0a6d66a07ca6e2be1a4bfb40464b415f9e6b971d37e42b8c61b49e68a424006da1b1843cab07a375754394fae9
+  metadata.gz: ac96d3e8c1065a638dc095a178a8267dd740fc7dd06f92f682c1480f81ec422e14ca1b167e55e91c63d5c3bb32888404878e538a9694c0a1a55ee10795c1123c
+  data.tar.gz: f78b39ef0d0a0b7491c6f45d4036c97544922d8f12704ac80e80b3a99b4c3f1f0e45c38541304f808533453fc54be5ddacf2431987018c4d2721eb87efbe8e2b

data/lib/game.rb

@@ -32,8 +32,6 @@ class Game
   end
 
   def over? 
-    return true if @ttt.winning_player?('x') || 
-                   @ttt.winning_player?('o') ||
-                   @ttt.available_spaces == []
+    return true if @ttt.x_won || @ttt.o_won || @ttt.tie
   end
 end

data/lib/ttt.rb

@@ -2,71 +2,79 @@ class TTT
   PLAYER_ONE = 'x'
   PLAYER_TWO = 'o'
   
-  attr_accessor :board, :turn
+  attr_accessor :board, :current_player
 
-  def initialize(board = Array.new(9) {"-"}, turn = PLAYER_ONE)
+  def initialize(board = Array.new(9) {"-"}, current_player = PLAYER_ONE)
     @board = board
-    @turn = turn
+    @current_player = current_player 
   end
 
   def make_move(space)
-    @board[space] = @turn
-    @turn = @turn == PLAYER_ONE ? PLAYER_TWO : PLAYER_ONE
+    @board[space] = @current_player
+    @current_player = @current_player == PLAYER_ONE ? PLAYER_TWO : PLAYER_ONE
   end
   
   def available_spaces
     @board.map.with_index { |space, index| index if space == '-' }.compact
   end
 
-  def count_empty_spaces
-    available_spaces.count
-  end
-
-  def new_move(space)
-    new_ttt = deep_copy
-    new_ttt.make_move(space)
-    new_ttt
+  def new_board_with_move(space)
+    board_with_current_player = deep_copy
+    board_with_current_player.make_move(space)
+    board_with_current_player
   end
 
   def deep_copy
     copy = dup
     copy.board = board.dup
-    copy.turn = turn.dup
+    copy.current_player = current_player.dup
     copy
   end
 
-  def possible_moves
-    available_spaces.map { |space| new_move(space) }
+  def possible_boards
+    available_spaces.map { |space| new_board_with_move(space) }
   end
 
   def possible_values
-    possible_moves.map { |move| move.minimax }
+    possible_boards.map { |board| board.minimax }
+  end
+
+  def best_move
+    return available_spaces.max_by { |space| new_board_with_move(space).minimax } if @current_player == PLAYER_ONE
+    return available_spaces.min_by { |space| new_board_with_move(space).minimax } if @current_player == PLAYER_TWO 
   end
 
   def minimax
-    return 100 if winning_player?(PLAYER_ONE)
-    return -100 if winning_player?(PLAYER_TWO)
-    return 0 if !winning_player?(PLAYER_ONE) &&
-                !winning_player?(PLAYER_TWO) &&
-                count_empty_spaces == 0
-    return possible_values.max + count_empty_spaces if @turn == PLAYER_ONE 
-    return possible_values.min - count_empty_spaces if @turn == PLAYER_TWO 
+    return 100 if x_won 
+    return -100 if o_won 
+    return 0 if tie
+    return possible_values.max + available_spaces.count if @current_player == PLAYER_ONE 
+    return possible_values.min - available_spaces.count if @current_player == PLAYER_TWO 
   end
 
-  def best_move
-    return available_spaces.max_by { |space| new_move(space).minimax } if @turn == PLAYER_ONE
-    return available_spaces.min_by { |space| new_move(space).minimax } if @turn == PLAYER_TWO 
+  def x_won
+    winning_player?(PLAYER_ONE)
+  end
+
+  def o_won
+    winning_player?(PLAYER_TWO)
+  end
+
+  def tie
+    !winning_player?(PLAYER_ONE) &&
+    !winning_player?(PLAYER_TWO) &&
+    available_spaces.count == 0
   end
 
-  def winning_player?(turn)
-    return true if @board[0..2]                      == [turn] * 3
-    return true if @board[3..5]                      == [turn] * 3
-    return true if @board[6..8]                      == [turn] * 3
-    return true if [@board[0], @board[3], @board[6]] == [turn] * 3
-    return true if [@board[1], @board[4], @board[7]] == [turn] * 3
-    return true if [@board[2], @board[5], @board[8]] == [turn] * 3
-    return true if [@board[0], @board[4], @board[8]] == [turn] * 3
-    return true if [@board[2], @board[4], @board[6]] == [turn] * 3
+  def winning_player?(current_player)
+    return true if @board[0..2]                      == [current_player] * 3
+    return true if @board[3..5]                      == [current_player] * 3
+    return true if @board[6..8]                      == [current_player] * 3
+    return true if [@board[0], @board[3], @board[6]] == [current_player] * 3
+    return true if [@board[1], @board[4], @board[7]] == [current_player] * 3
+    return true if [@board[2], @board[5], @board[8]] == [current_player] * 3
+    return true if [@board[0], @board[4], @board[8]] == [current_player] * 3
+    return true if [@board[2], @board[4], @board[6]] == [current_player] * 3
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ttt_gem_8thlight
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Meagan Waller