game-tictactoe-esegredo 0.0.1 → 0.0.2

data/Rakefile

@@ -11,6 +11,11 @@ task :smart do
 	sh "ruby -Ilib bin/tictactoe_game.rb"
 end
 
+desc "Run TicTacToe game vs minimax player"
+task :minimax do
+	sh "ruby -Ilib bin/tictactoe_game.rb -m"
+end
+
 desc "Run TicTacToe game vs dumb player"
 task :dumb do
 	sh "ruby -Ilib bin/tictactoe_game.rb -d"
@@ -35,3 +40,10 @@ desc "Run DumbPlayer tests"
 task :dp_test do
 	sh "ruby -Ilib test/tc_dumbplayer.rb"
 end
+
+desc "Run TicTacToe by specifying two different players"
+task :player, :x_player, :o_player do |player, args|
+  x_player = args[:x_player] || 'human'
+  o_player = args[:o_player] || 'minimax'
+  sh "ruby -Ilib bin/tictactoe_game_players.rb #{x_player} #{o_player}"
+end

data/bin/tictactoe_game_players.rb

@@ -0,0 +1,26 @@
+require "game-tictactoe-esegredo"
+
+if __FILE__ == $0
+  if (ARGV.size == 2)
+		player1 = case ARGV[0].downcase
+			when "smart" then Tictactoe::SmartPlayer
+			when "minimax" then Tictactoe::MinimaxPlayer
+			when "dumb" then Tictactoe::DumbPlayer
+			when "human" then Tictactoe::HumanPlayer
+			else Tictactoe::HumanPlayer
+		end
+		
+		player2 = case ARGV[1].downcase
+			when "smart" then Tictactoe::SmartPlayer
+			when "minimax" then Tictactoe::MinimaxPlayer
+			when "dumb" then Tictactoe::DumbPlayer
+			when "human" then Tictactoe::HumanPlayer
+			else Tictactoe::HumanPlayer
+		end
+		
+    game = Tictactoe::Game.new(player1, player2, false)
+  	game.play
+	else
+		puts "Usage: ruby -Ilib bin/tictactoe_game_players.rb player_x player_o"
+	end
+end

data/lib/game-tictactoe-esegredo.rb

@@ -27,10 +27,18 @@ module Tictactoe
         break if @board.won?
             
         @board[@o_player.move(@board)] = @o_player.mark
-      end 
-          
-      @o_player.finish @board
-      @x_player.finish @board
+      end
+
+			puts @board
+
+      if @board.won? == @x_player.mark
+        print "Player (#{@x_player.mark}) has won!\n\n"
+      elsif @board.won? == " "
+        print "Tie game.\n\n"
+      else
+        print "Player (#{@o_player.mark}) has won!\n\n"
+      end
     end 
+
   end 
 end

data/lib/tictactoe/humanplayer.rb

@@ -14,17 +14,5 @@ module Tictactoe
       end
       move.chomp
     end
-    
-    def finish( final_board )
-      print final_board
-      
-      if final_board.won? == @mark
-        print "Congratulations, you win.\n\n"
-      elsif final_board.won? == " "
-        print "Tie game.\n\n"
-      else
-        print "You lost tic-tac-toe?!\n\n"
-      end
-    end
   end
 end

data/lib/tictactoe/minimaxplayer.rb

@@ -9,47 +9,49 @@ module Tictactoe
       # For each available movement
       bestValue = -2
       bestMove = ""
-      moves.each do |move|
+      moves.each do |mov|
         newsquares = board.squares.dup
         newboard = Board.new(newsquares)
-        value = search_best_move(newboard, move, self.mark, 1)
-        if (value >= bestValue)
+        newboard[mov] = self.mark
+        value = search_best_move(newboard, opponent_mark, 1)
+        if (value > bestValue)
           bestValue = value
-          bestMove = move
+          bestMove = mov
         end
       end
       bestMove
     end
 
-    def search_best_move(board, move, mark, level)
-      # Puts the movement on the board
-      board[move] = mark
-      moves = board.moves
-
-      # Checks whether there is a winner or not
+    def search_best_move(board, mark, level)
+			# Checks if there is a winner	
       return 1 if (board.won? == self.mark)
       return 0 if (board.won? == " ")
       return -1 if (board.won? == opponent_mark)
+      
+      # Gets the available movements
+      moves = board.moves
 
-      # Max level
+      # Min level
       if ((level % 2 == 1) && (!board.won?))
-        bestValue = -2;
+        bestValue = 2
         moves.each do |mov|
           newsquares = board.squares.dup
           newboard = Board.new(newsquares)
-          value = search_best_move(newboard, mov, opponent_mark, level + 1)
-          if (value >= bestValue)
+          newboard[mov] = mark
+          value = search_best_move(newboard, self.mark, level + 1)
+          if (value < bestValue)
             bestValue = value
           end
         end
-      # Min level
+      # Max level
       elsif ((level % 2 == 0) && (!board.won?))
-        bestValue = 2;
+        bestValue = -2
         moves.each do |mov|
           newsquares = board.squares.dup
           newboard = Board.new(newsquares)
-          value = search_best_move(newboard, mov, self.mark, level + 1)
-          if (value <= bestValue)
+          newboard[mov] = mark
+          value = search_best_move(newboard, opponent_mark, level + 1)
+          if (value > bestValue)
             bestValue = value
           end
         end

data/lib/tictactoe/player.rb

@@ -9,8 +9,6 @@ module Tictactoe
     def move( board )
       raise NotImplementedError, "Player subclasses must define move()."
     end
-    
-    def finish( final_board )  
-    end
+
   end
 end

data/lib/tictactoe/version.rb

@@ -1,3 +1,3 @@
 module Tictactoe
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/dumbplayer_spec.rb

@@ -9,8 +9,4 @@ describe Tictactoe::DumbPlayer do
 		@dp.respond_to?("move").should == true
 	end
 	
-	it "Debe existir un metodo finish" do
-		@dp.respond_to?("finish").should == true
-	end
-
 end

data/spec/humanplayer_spec.rb

@@ -9,7 +9,4 @@ describe Tictactoe::HumanPlayer do
 		@hp.respond_to?("move").should == true
 	end
 
-	it "Debe existir un metodo finish" do
-		@hp.respond_to?("finish").should == true
-	end
 end

data/spec/minimaxplayer_spec.rb

@@ -0,0 +1,21 @@
+require "game-tictactoe-esegredo"
+
+describe Tictactoe::MinimaxPlayer do
+	before :each do
+		@mp = Tictactoe::MinimaxPlayer.new("X")
+	end
+
+	it "Debe existir un metodo move" do
+		@mp.respond_to?("move").should == true
+	end
+	
+	it "El metodo move debe tratar de evitar la derrota" do
+		@board = Tictactoe::Board.new(["X", "X", "O", "O", "O", "X", " ", "O", " "])
+		@mp.move(@board).should == "c1"
+  end
+	
+	it "El metodo move debe tratar de ganar" do
+		@board = Tictactoe::Board.new([" ", "O", "X", " ", "X", " ", "O", "O", "X"])
+		@mp.move(@board).should == "a1"
+  end
+end

data/spec/smartplayer_spec.rb

@@ -9,8 +9,4 @@ describe Tictactoe::SmartPlayer do
 		@sp.respond_to?("move").should == true
 	end
 	
-	it "Debe existir un metodo finish" do
-		@sp.respond_to?("finish").should == true
-	end
-
 end

data/test/tc_dumbplayer.rb

@@ -9,8 +9,4 @@ class TestDumbPlayer < Test::Unit::TestCase
 	def test_implements_move
 		assert_equal true, @dp.respond_to?("move")
 	end
-	
-	def test_implements_finish
-		assert_equal true, @dp.respond_to?("finish")
-	end
 end

data/test/tc_humanplayer.rb

@@ -9,8 +9,4 @@ class TestHumanPlayer < Test::Unit::TestCase
 	def test_implements_move
 		assert_equal true, @hp.respond_to?("move")
 	end
-	
-	def test_implements_finish
-		assert_equal true, @hp.respond_to?("finish")
-	end
 end

data/test/tc_smartplayer.rb

@@ -9,8 +9,4 @@ class TestSmartPlayer < Test::Unit::TestCase
 	def test_implements_move
 		assert_equal true, @sp.respond_to?("move")
 	end
-	
-	def test_implements_finish
-		assert_equal true, @sp.respond_to?("finish")
-	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: game-tictactoe-esegredo
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-21 00:00:00.000000000 Z
+date: 2012-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &21944360 !ruby/object:Gem::Requirement
+  requirement: &15662220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21944360
+  version_requirements: *15662220
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &21943600 !ruby/object:Gem::Requirement
+  requirement: &15661560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21943600
+  version_requirements: *15661560
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &21942600 !ruby/object:Gem::Requirement
+  requirement: &15660620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,12 +43,13 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21942600
+  version_requirements: *15660620
 description: Gem which implements the Tic-Tac-Toe game with different kind of players
 email:
 - edusegre@gmail.com
 executables:
 - tictactoe_game.rb
+- tictactoe_game_players.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -59,6 +60,7 @@ files:
 - README.md
 - Rakefile
 - bin/tictactoe_game.rb
+- bin/tictactoe_game_players.rb
 - game-tictactoe-esegredo.gemspec
 - lib/game-tictactoe-esegredo.rb
 - lib/tictactoe/board.rb
@@ -70,6 +72,7 @@ files:
 - lib/tictactoe/version.rb
 - spec/dumbplayer_spec.rb
 - spec/humanplayer_spec.rb
+- spec/minimaxplayer_spec.rb
 - spec/smartplayer_spec.rb
 - test/tc_dumbplayer.rb
 - test/tc_humanplayer.rb
@@ -101,6 +104,7 @@ summary: Gem which implements the Tic-Tac-Toe game with different kind of player
 test_files:
 - spec/dumbplayer_spec.rb
 - spec/humanplayer_spec.rb
+- spec/minimaxplayer_spec.rb
 - spec/smartplayer_spec.rb
 - test/tc_dumbplayer.rb
 - test/tc_humanplayer.rb