swttt-gem 1.1.0 → 1.2.0

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/lib/abcomputer.rb

@@ -0,0 +1,65 @@
+class ABComputer
+  def initialize
+
+  end
+  
+  def make_move
+    alpha = (-1.0)/(0.0)
+    beta = (1.0)/(0.0)
+    best_score = nil
+    iterate_board do |row, column|
+      @board.make_move(row, column)
+      path_score = get_max(1, alpha, beta)
+      @board.undo_move
+      if best_score.nil? || path_score > best_score
+        best_row = row
+        best_column = column
+        best_score = path_score
+      end
+    end
+  end
+
+  def get_max(depth, alpha, beta)
+    iterate_board do |row, column|
+      if alpha > beta
+        return alpha
+      else
+        if @board.is_empty_at(row, column)
+          @board.move(row, column)
+          if @observer.game_over?
+           return -@board.player_value if @observer.has_winner?
+           return 0
+          else
+           value = get_min(depth+1, alpha, beta)
+           alpha = value if alpha < value
+          end
+        end
+      end
+    end
+  end
+
+  def get_min(depth, alpha, beta)
+    iterate_board do |row, column|
+      if alpha < beta
+        return beta
+      else
+        if @board.is_empty_at(row, column)
+          @board.move(row, column)
+          if @observer.game_over?
+           return -@board.player_value if @observer.has_winner?
+           return 0
+          else
+           value = get_max(depth+1, alpha, beta)
+           beta = value if beta > value
+          end
+        end
+      end
+    end
+  end
+
+private
+
+  def iterate_board
+    (1..3).each { |row| (1..3).each { |column| yield(row, column) } }
+  end
+end

data/lib/board.rb

@@ -18,7 +18,7 @@ class Board
 
   def undo_move
     move = @game_history.pop
-    update_sums(move.row-1, move.column-1, -player_value)
+    update_sums(move.row-1, move.column-1, -move.player_value)
     @board[move.row-1][move.column-1] = 0
   end
 

data/lib/minimax_computer.rb

@@ -63,15 +63,15 @@ private
   end
 
   def calculate_score(iteration)
-    if immediate_win?(iteration)
+    if immediate_win_or_loss?(iteration)
       return infinity
     else
       return perform_mini_max(iteration + 1)
     end
   end
 
-  def immediate_win?(iteration)
-    iteration.zero? && @observer.has_winner?
+  def immediate_win_or_loss?(iteration)
+    iteration<2 && @observer.has_winner?
   end
 
   def infinity

data/spec/minimax_computer_spec.rb

@@ -26,13 +26,28 @@ describe MinimaxComputer do
   end
 
   it "takes an immediate win" do
-    @my_board.move(1,0)
+    @my_board.move(2,1)
+    @my_board.move(3,3)
     @my_board.move(2,2)
+    @my_board.move(2,3)
     @my_board.move(1,1)
-    @my_board.move(1,2)
-    @my_board.move(0,0)
     @computer.move
     @observer.has_winner?.should be_true
     @my_board.number_of_moves_made.should == 6
   end
+
+  it "takes a corner or middle piece for first move" do
+    @my_board.move(2,3)
+    @computer.move
+    [Move.new(1,1), Move.new(1,3), Move.new(3,1),
+     Move.new(3,3)].include?(@my_board.game_history.last).should be_true
+  end
+
+  it "blocks immediate losses" do
+    @my_board.move(2,3)
+    @computer.move
+    @my_board.move(1,3)
+    @computer.move
+    @my_board.value_at(3,3).should == -1
+  end
 end

data/swttt-gem.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{swttt-gem}
-  s.version = "1.1.0"
+  s.version = "1.2.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-11}
+  s.date = %q{2011-05-19}
   s.description = %q{TTT Gem}
   s.email = %q{stephenwalker1988@gmail.com}
   s.extra_rdoc_files = [
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "lib/.DS_Store",
+    "lib/abcomputer.rb",
     "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: 19
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Stephen Walker
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-11 00:00:00 -05:00
+date: 2011-05-19 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -97,6 +97,7 @@ files:
 - Rakefile
 - VERSION
 - lib/.DS_Store
+- lib/abcomputer.rb
 - lib/board.rb
 - lib/game_observer.rb
 - lib/human_player.rb